Merge "BatteryStatsManager: Move constants from @hide BatteryStats"