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

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

Change-Id: I1f00338e3ee33d246e1d8c013cff628ec5053270