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

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

Change-Id: Ifb54fa7afc814c429d8c1930313dde825aa13a53