Merge "health: AIDL HAL may replace HIDL HAL." am: 199b85ed07 am: 072e0f0d4b am: c3787b4d56

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

Change-Id: I2e85f29687644790197dc60148b3981b12fdc1e6