Merge changes Ia6247be7,Ie93b2eb7,I185986c6,I5f9999ba,I78300cd3, ... into oc-mr1-dev am: 0ee323f4e5 am: fd661bf2d0

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

Change-Id: I317b7f9312d67984e8850965c98ed1320406fe40