Merge changes from topic "am-0d79427f7e30403b9b0c8103c04413dc" into android11-tests-dev am: a993a28277

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

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