Merge "Test for bootloader state" am: eb94a4f9 am: e1c1abb0 am: cd06c174 am: dc91a4db

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



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