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

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

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