Merge "[CTS] Skip the test appropriately" into stage-aosp-sc-ts-dev am: 70c384b122

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

Change-Id: Ief829d94cf9db0335218c68eae6f0d5d2f189933