Merge changes Iee3f5dc0,Id4a81d5d,I51373d2d am: 88e5ae6407

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d0d93c52fde3b018f29cc56e2611064b9e7d3a1