[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: da65c0b9 -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: I87faa81a6d00ad48fc517fd7787c333d7721ecd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>