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

[automerger skipped] Merge "[DO NOT MERGE] resolve merge conflicts of a57cde11 to rvc-d1-dev-plus-aosp" into rvc-d1-dev-plus-aosp am: a8518be0 am: 9466f0ce -s ours

am skip reason: subject contains skip directive

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

Change-Id: I50811dcea7bee9b661ab861193ba396668f63355