Merge changes I21235930,I85434f35 into qt-qpr1-dev am: 42f4c349b9 am: d62075dfa2 am: 2dcf2eb52c

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

Change-Id: I8523421824f191274923d96b4b5f83d0c76b06af