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

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

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