[automerger skipped] [DO NOT MERGE] resolve merge conflicts of...

[automerger skipped] [DO NOT MERGE] resolve merge conflicts of a57cde11 to rvc-d1-dev-plus-aosp am: 1d5fbadc am: 6b1a278d -s ours

am skip reason: subject contains skip directive

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

Change-Id: I38b2cb7122af5350bb78244124afd6c883b64955