[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L14200030003427558:N90600030054625545" into 24D1-dev am: ff656cdb -s ours

am skip reason: Merged-In Icad0942f2ba1dcd6f030a7dc4f37e22fdbd6dd71 with SHA-1 a2a9fa50 is already in history

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



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