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

am skip reason: Merged-In I9cf28cae0c4836035290123ae33cf6d94052585e with SHA-1 b5fbcfb0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/27555168



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