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

am skip reason: Merged-In I9d64aa9d5630b90286c6336dd95ef1e2c9e43910 with SHA-1 9a8f074c01 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/bluejay/+/27554704

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