Merge "Check for failures in base SetUp()" am: ed2054123f am: 6ecb2d666c

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

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