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

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

Change-Id: I00c62735fb29db9d465de9bd34c0551bb36f9268