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

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



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