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

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

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