Merge changes I48279bba,I3baf29a5 into tm-qpr-dev am: 9f999d0920

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

Change-Id: I707e68e8d51cc5c5b1fffc6063c86017b2ce0551
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>