[automerger skipped] Merge changes from topic "cts-shim-lib" am: 76f021adba am: 80488f9a26 am: 150786652b am: 678ca6a59e am: 3bb46493c3 -s ours

am skip reason: Change-Id I523706806a1161a20fbe983b64bb8ee4e78fadbe with SHA-1 d4c1890d72 is in history

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

Change-Id: I672af4f56866e94f61332406c27276065577de3e