Merge cherrypicks of [16848665] into sc-v2-release. am: 5c5a1cac99

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

Change-Id: I918e0033254ddad5f9158d2bf79ba3e8f9b1d405