Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am:...

Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp am: 77efd5f4 am: f8c140c5

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



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