Merge changes Ib2cc8d90,I6f2751b3 into tm-qpr-dev am: 456e2fe90b am: 02398e9fb5

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

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