[automerger skipped] Merge stage-aosp-rvc-ts-dev into rvc-dev am: f73fe6b6bc am: 12c8a142ba -s ours

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

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

Change-Id: I0647493610849004e6ca2c85c2a83727325f29a4