[automerger skipped] Merge "Merge stage-aosp-rvc-ts-dev into rvc-dev am: f73fe6b6 am: e594b4db am: 99b0ded1" into rvc-qpr-dev-plus-aosp am: 2cc82302 -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: Ieb7d50bb719fdb698b0adc360c57696969b9516a