Merge changes Ie810d37d,I6947e1f7 into tm-qpr-dev am: 33b100711a

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

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