[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: 1ddf0426 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I8e22553c1019addf066d339c0bd2dfdb98830ed8