Merge stage-aosp-rvc-ts-dev into rvc-dev am: 3ded281871 am: 0b3af8cf16

Original change: https://googleplex-android-review.googlesource.com/c/platform/test/vts-testcase/hal/+/12203565

Change-Id: Ifc2139e585a3715e01bc9890e36a291821c114f5