Merge changes I22f22bf8,I7a9dd679,I3f13b811 into pi-dev am: e9d4027ac8

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

Change-Id: I36e07829d786ef486ad562cfa558e40478c83620