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: I74978fe2cd4eabf829d72ac7e9feee51fb3cd799