Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: b19afd3d01" into android12-tests-dev