Merge changes Idadefb77,I733f3ebd into pi-dev am: 89bdcb9d28

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

Change-Id: I15ab10a6f16e686e27414070ac701918c3fce4da