Merge changes Ib51be068,If07e7dfa into pi-dev am: c5405bcad0 am: 11ed4b4735 am: f1f71ef74e am: 3a72cc8df6 am: 35b2238cb0 am: 2a18d0ba62 am: 5472cf2b5b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id1df3174a074b563350a80ce99d2f973ee7d8654