Merge "Add CTS for BatteryStatsManager new API"