Merge "health package: switch to aidl HealthInfo"