[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into...

[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: 5b64d613 -s ours

am skip reason: Merged-In I4cc82131bb070a37cb6ed9dbe9d7cccc7ab5ee89 with SHA-1 23e78269 is already in history

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



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