Merge changes Iaef3c67b,I983277fd into tm-qpr-dev am: 9dca500295 am: 558ed11961

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

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