Merge changes I095a869f,I587dfebb into sc-dev am: a694e6fa56

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

Change-Id: I5dab3f133c6683bc064cffad1c183fe6ef6c7590