Merge changes from topic "health-aidl" am: 713d22e0f1 am: f802438361 am: 54a25b2d7c

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

Change-Id: I6e940902dbd08b30f54fb06c970743a8aa3b34ca