Merge changes I6843e949,Ied9eea84,Id3ae744f into tm-qpr-dev am: 5d668fd0f6 am: c91e7f3d70

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21084803

Change-Id: I609036046775604c7a44b1a3dd24aad91dc65cac
Signed-off-by: Automerger Merge Worker <[email protected]>