Merge "health: batterymonitor uses AIDL HealthInfo." am: e9cb1bedfd

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

Change-Id: Ic95ccd4d9740774ad9d76491329b61b609874c4a