Merge "Cherry picking I88ca5f9c556795c602571af07cc1685d470ff9af to rvc-dev." into rvc-dev am: d7f311ddcd am: fbd70b31a9

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/12871946

Change-Id: I45d98c5553c5ae355815afcb0cb5c344720d2a05