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

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

Change-Id: I235300ecfc7cc1c8e2294d8ad476bfac31cc1ba4