Merge changes Ib51be068,If07e7dfa into pi-dev am: c5405bcad0 am: 11ed4b4735

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic297fab9f5c53751888e261c3668db88fe92eff6