Merge "Allow uninstantiated BootloaderStateTest" am: d83eed2fe3 am: cfc708d3ef

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

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