Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev