[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to...

[automerger skipped] Merge 2024-06 Release (ab/AP2A.240605.024) to aosp-main-future am: 3c3a1cc6 -s ours

am skip reason: Merged-In Id3d79805bb2289b84ad34ac05a97e50f0410502f with SHA-1 a39c14c0 is already in history

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



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