[automerger skipped] Merge changes I5107bcf4,Ibb1bbf18,I95db3ff5,Ia1b619bd,Ibaad31f7, ... into oc-dev am: 0db484f917 am: cbabe2bf18 -s ours

am skip reason: Change-Id I5107bcf4bfd67338c78c60e1cc0dab2430b69d82 with SHA-1 008e7038f5 is in history

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

Change-Id: Ia1e1dda8f176fc0ecea840f8cc5fd75a2f1e4f7f