Merge "healthd: batterymonitor uses AIDL HealthInfo." am: 0326984c42

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2004731

Change-Id: I04af2fc284637ea5f371e81a28a62c603de2f34d