Merge changes from topic "tc_change_23050307_36" into udc-dev-plus-aosp am: 3470cbb3 am: be65003b

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



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