[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L74500030002769125:N35700030046036139" into 24D1-dev am: e2218d7b -s ours

am skip reason: Merged-In I2a2dbc22e1532fcb11ab256830cecba9f6c54446 with SHA-1 641f0aed is already in history

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



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