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

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

Change-Id: I1eccf5da811eca0c626fcf4a2f9693112af34757