Merge "Quick-fail NNAPI VTS test case if driver is dead" am: 994a3856c9 am: 77c62d1131

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

Change-Id: Id4aeb0e651dd315fb3e859c3b49177211b6065f0