Merge changes Ica9510b5,Id98a29de am: cb5f7bb658 am: 7a5d8485b1

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

Change-Id: I0035d9a374d29b9bd88c09312f5f9f8af5d7c4bd