Merge changes I85cc3ca3,I3b3e2c09,I26d8c6c1 into rvc-dev am: bd709f2a70 am: babc71f57b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4746c357bf4b000df823ba187aa540d308ffedc2