Merge changes Iec3baf09,Id7332818,Ief9e6ca7,I702dbf2a,I15b22869, ... into oc-mr1-dev am: d3b4edbde2

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie20e44d40a9b3640f9c8c347a054158ff7e7fdcc