Merge changes I22f22bf8,I7a9dd679,I3f13b811 into pi-dev am: e9d4027ac8 am: 6ca342a0ef am: 4776610c07

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

Change-Id: I8b1879b383fdfc0766474e68c684be4c0fd6cc0d