Merge "Backport some OWNERS files" into android12-tests-dev