Merge changes from topic "tc_change_2305100725_10" into udc-dev am: c834547d am: 943b36f0

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



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