Merge "VtsHalTargetTest: Improve error checks" into main am: 5cc134965c

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

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