Merge changes I79f68e5a,I63b44fe9 into oc-mr1-dev am: 32b3f06410 am: fddfdc0a20 am: 72aa98869d am: 93f78b62d0 am: eba6059691

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7b5cc91b0161e8c61dfe6bfbddebd316469d73d