Merge changes Ia6247be7,Ie93b2eb7,I185986c6,I5f9999ba,I78300cd3, ... into pi-dev am: 783840efae am: 7f1266fdbf

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

Change-Id: Ib37f018cf76fb8095ebcf87dfe50b1b2e550fa57