Merge "health: batterymonitor uses AIDL HealthInfo."