Merge changes Ieb0c7c3a,I9fcc79b7 into stage-aosp-sc-ts-dev am: ae4da05c12 am: 746ff01231 am: 25f58782e4

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

Change-Id: Ifcc6d5ae5e1ca27a89744f2706082ba27dd621e8