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

[automerger skipped] [DO NOT MERGE] resolve merge conflicts of f1e06c0a to rvc-dev-plus-aosp am: f0382481 -s ours am: b4310276 -s ours

am skip reason: Change-Id I4f79427ceeaec1b823270bbc8f2513ed28ea8f67 with SHA-1 1d5fbadc is in history

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

Change-Id: I1bbf7be122c039ecf9b97206e69faed425dd53fc