Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be am: 58c8fae9

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667



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