[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: 44d3c2ef -s ours am: db5bee57 -s ours

am skip reason: subject contains skip directive

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



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