Merge changes I4f8d3641,I07ccc032 into rvc-dev am: e042f758cc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2af001bffa7b765b12b81210a9ae5b018bf31ce5