Merge "BatteryStatsImpl uid blaming for measured energy data"