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

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



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