Merge changes from topic "tc_change_23050307_53" into udc-dev-plus-aosp am:...

Merge changes from topic "tc_change_23050307_53" into udc-dev-plus-aosp am: 993a19c1 am: 132cc70a am: 920ea071

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



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