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

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

Change-Id: I7d247c28a9d6270a0d187a326b43bc60e3f5dfa3