Merge changes Ib51be068,If07e7dfa into oc-mr1-dev am: cc6c424027 am: 35b85ddf83 am: eec7cf19fb am: f700accf53 am: 26403f2839 am: 6497d8d515 am: 9e35f03b03

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcf1bede7790a21edc8f66398d7709d1fe38e19a