Merge changes from topic "tc_change_23050307_49" into udc-dev-plus-aosp am: 7e920158 am: 9517385b

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



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