[automerger skipped] Merge 24Q3 (ab/AP3A.240905.015) to aosp-main-future am: 0b886fe3 -s ours

am skip reason: Merged-In I54a12b03ed9be6dc49fb957df0f1f7b31647810d with SHA-1 da211285 is already in history

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



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