Merge changes from topic "am-5bba1c3979e84d63b77d19ae41de4080" into android11-tests-dev am: f794d06b09

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

Change-Id: I102886cca2cedb7b341f6b77ba0b00b5f6c6aea5