Merge changes I234d0e06,I295b251b,I4bb3c70c,I09895915,I19b8c604 into oc-mr1-dev am: fc96a579e7 am: 29649975a1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie534d668674701147cbe0cb85bd3f1d046758c94