Merge "Fix test run for GSI" into main am: 74d99edac1 am: 6f5630cd21

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2931355

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