Merge changes from topic "am-fd1a3f615f394aaf91615efaed5222ab" into android11-tests-dev am: 6a2dbde

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

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

Author: android-build-merge-worker-robot