Merge changes I5107bcf4,Ibb1bbf18,I95db3ff5,Ia1b619bd,Ibaad31f7, ... into oc-dev am: 0db484f917

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

Change-Id: I9256c63fb47cb1c275d30311f4bf42b477f8993f