Merge changes Ib51be068,If07e7dfa into oc-mr1-dev am: cc6c424027 am: 35b85ddf83

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iee93cac8a29633fa917d471ecb45d22f6bc06bf9