Merge changes from topic "bug169389392" into pie-cts-dev am: 4eec76f994

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

Change-Id: Id6f653056134488fa8975734b131dee36f578957