[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: 9c2c02dd -s ours

am skip reason: Merged-In If12d978ee69ee7f087a7e8758513a9c6bacf817f with SHA-1 53238b1a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/27555390



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