Merge changes from topic "am-c54e5100772b4e8a9108d68cd03b73e3" into android11-tests-dev am: d75590c551

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

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