[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: f0e00b8bf7 -s ours

am skip reason: Merged-In I96574a79eba581db95d387f0d9c9fde2e004c41c with SHA-1 c9a3eeb792 is already in history

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

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