Merge "Protobufferize BatteryManager dumpsys"