Merge changes I47c45484,Ib9d1fcb6 into stage-aosp-sc-ts-dev am: 1c9d9de0b6 am: eeab74d49b am: f4343400c3

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

Change-Id: I9eec131966d41ebe9fa8a2277831a71df506de9c