Merge changes Ifb19c206,I9e9bddb9 into sc-dev am: 4d8c802359 am: 2581f923fb

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

Change-Id: Ie50e77d6918b0fb835451b7b5ec37e5724e23a16