Merge changes Ib61ed2b1,I7a38a27b,I89f0df4a into oc-mr1-dev am: aea7904b6f

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

Change-Id: I6c654481977900ae798f5c70dbba3591340c0ac6