Android CTS 12.1 Release 2 (8602832)
Merge "Mark ab/8389834 as merged" into android12L-tests-dev