[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: f73fe6b6...

[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: f73fe6b6 am: 2cda765a am: 9e963a6a -s ours am: 5f1b08b3 -s ours

am skip reason: Change-Id Ia102f1a63fddcaa43365e35680ea04242fe2ee80 with SHA-1 94c6cdce is in history

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

Change-Id: I5436ab0cf48a112592ce3813b69a405b2ee73c88