Merge changes Ibf6bf1ac,If782590b,I7f1cbe9d,Ia6bed394 into oc-mr1-dev am: ba2284c81a am: 1e62c58e0c am: 13c936b29c am: a7fc337d5d am: ddf26f34f8 am: f224ef8d45

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

Change-Id: Ia4c2aaae93d5511cd31bec676900709a7e7cd6c8