Merge "DO NOT MERGE. Fix the cts tests" into android11-tests-dev