Merge "allow BootHidlTest uninstantiated" am: c7ae3c24cf am: 955271a35a

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

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