Merge changes Ibf6bf1ac,If782590b,I7f1cbe9d,Ia6bed394 into rvc-dev am: 40b32eefa1

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

Change-Id: I1ab3dd041b3840aa3a27640ccc4a4c1cd03f24b3