Merge "Merge "[manual merge] Merge changes from topic "tc_change_23042206_55"...

Merge "Merge "[manual merge] Merge changes from topic "tc_change_23042206_55" into tm-qpr-dev-plus-aosp --ours" into udc-dev-plus-aosp am: b62da8d5" into udc-d1-dev-plus-aosp am: fa739887

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



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