[automerger skipped] Merge 24Q4 (ab/12406339) into aosp-main-future am: cfa19e11 -s ours

am skip reason: Merged-In Ie90e7495dd4a134538bae6e3e08eea0d02134b14 with SHA-1 62449dd6 is already in history

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



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