Merge "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" into android13-tests-dev am: 7650777c5f am: 46f24d4cdb am: e71b13d488

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

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