[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to...

[automerger skipped] Merge "Merge 24Q3 (ab/AP3A.240905.001) to aosp-main-future" into aosp-main-future am: 20fb15ea -s ours

am skip reason: Merged-In I2489a64804f068a957f9be3f87847d6911b24447 with SHA-1 28718116 is already in history

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



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