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