Merge "Remove BatteryStats user activity types and use PowerManager ones instead." into tm-qpr-dev