Merge "[DO NOT MERGE] Parameterize compat tests, so tests consistently pass on sc-v2" into android12L-tests-dev