Merge changes Idadefb77,I733f3ebd into pi-dev am: 89bdcb9d28 am: 3e9b2d6286 am: 1664b72efb

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

Change-Id: I5946a6010046a002c5980c2ec969ef86ac523c4e