Merge changes from topic "am-6b71b1b78d36431e9b23f91a0d2104d5" into main am: 57e91ec556 -s ours

am skip reason: Merged-In I42b6b475b572951f4117e9dea91d848d82550a53 with SHA-1 40678f62cc is already in history

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

Change-Id: Id1b7197c972f71a31e2423e3122a2fa5032d962e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>