[automerger skipped] DO NOT MERGE - Merge Android 13 am: 65270bba -s ours...

[automerger skipped] DO NOT MERGE - Merge Android 13 am: 65270bba -s ours am: b49f968a -s ours am: 163d0898 -s ours

am skip reason: Merged-In I3ad2e2000fb0db6a62835e621bc81d77308db140 with SHA-1 e08d1410 is already in history

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



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