Android VTS 12.1 Release 4 (9195718)
Merge "Mark ab/8389834 as merged" into android12L-tests-dev