Merge "Merge "BatteryStatsHelper: Include screen on baseline power draw" into...
Merge "Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am: c708cf63 am: 2d533c4c" into nyc-mr1-dev-plus-aosp
am: 4ceeba24
* commit '4ceeba24':
Change-Id: If32f8b7d6b775d844ce992b61d92a127cdc93dc6