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

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

Change-Id: I66a5983036a8679c5469a4295126aeee238ad303