Merge "batteryservice: expose battery status"