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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8fa955cc4267013e7310091a1197d35a32078233