Merge changes Ib24fd21b,Ied622da6 into rvc-dev am: 89c935b287 am: f3a38e7312 am: 4b3aaeda40

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

Change-Id: I645864869814d93946b7991f6933f4f3cd9116e9