Merge "Remove BatteryStats user activity types and use PowerManager ones instead."