Merge stage-aosp-rvc-ts-dev into rvc-dev am: f73fe6b6bc

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

Change-Id: I72a7c52c280cc1b99a67ef3c0e6bf569a176bd82