Merge "Merge changes from topic "tc_change_23050307_39" into tm-qpr-dev-plus-aosp am: 16c3f0ac" into udc-dev-plus-aosp am: 8f3a8634

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



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