Merge changes Ieb0c7c3a,I9fcc79b7 into stage-aosp-sc-ts-dev am: ae4da05c12

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

Change-Id: If23b14d4574c005f34a9285d424d6c45c24db60c