Merge "Fix for CTS test" into stage-aosp-rvc-ts-dev am: 7df1cbd54f am: 49fd6d29b6

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

Change-Id: Id42ec4f4c71750467845a601fe256ffb021fbd95