Merge "Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: b19afd3d01" into android12-tests-dev am: 886dfe2c36" into android12L-tests-dev am: 66f20d311e

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2606270

Change-Id: I2c023dc12ad29e623718b6d79927de0a036bb8eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>