Merge "Update OWNERS for display in CtsVerifier" into android12L-tests-dev