Merge changes from topic "tc_change_23050307_34" into tm-qpr-dev-plus-aosp am: 63396de7 am: b95eefa8

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



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