Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f am:...

Merge "Merge UP1A.230905.019" into aosp-main-future am: 770a4e1f am: bc31bffa am: 21a77533 am: 4a46f2bc

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



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