Merge changes I533083a9,Ib5859d17,Id877ccaa am: 6803057b0e

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

Change-Id: I028613617822280e67172618c672af82a648aa45