Merge "health: batterymonitor uses AIDL HealthInfo." into tm-dev