Merge "Mark ab/8389834 as merged" into android12L-tests-dev