Merge changes I6948de2f,I5ea96193 into pi-dev am: e778f35d15 am: bef0e54a45 am: a25c4f57be am: cbe64b9f90 am: 62f23cfdaf

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdd817c620a99ff0db6a4f90f3d624c7cc23d6e4