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

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

Change-Id: I097dc63a3f4ecb41ab4ee1e4e8ae4b99d2a0753e