Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."" am: ac7e154391 am: 41aaa16fca am: ce2c6d611d am: 01881f45fb

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

Change-Id: Ia09c8e4e6f3373fb3b9596d47d2a87ddf6ca2cf0