[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypicker-L17700000962261813:N11400001392188571" into main am: b93626c4 am: af716e23 -s ours

am skip reason: Merged-In Id160730a334bf09b91115ada2706c89e6b80192a with SHA-1 bfeecf3e is already in history

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



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