[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 300b4550 -s ours

am skip reason: Merged-In Iebec11afc62ecb79386e1866af57cd4e68461a95 with SHA-1 41902bb0 is already in history

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



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