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

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

Change-Id: I21a560bfca601d5d86d48127d06e4b0cc3182a41