[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to...

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

am skip reason: Merged-In I53a278f1317f5307441103dc42dc5be6f20d7075 with SHA-1 0a36f19c is already in history

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



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