Merge "Revert^2 "health: require AIDL HAL and deprecate HIDL HAL."" am: ac7e154391

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

Change-Id: I66e5209ddfba025f43ca0beb7067e6e0e29f9e46