Merge changes I84f42d1e,Iedf181e8,Id267175f,I23d60bfa into oc-mr1-dev am: bd398be01b am: 6661150dbd am: 7d3f4ad401 am: 9534734883 am: 6ef4080d1c am: 4db4886bba am: af11d85609

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iafa55bf770e2103cd644135377342bfdce6c4e57