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

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

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