Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev...
Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev am: c708cf63 am: 051b810d
am: a5558ab5
* commit 'a5558ab5':
BatteryStatsHelper: Include screen on baseline power draw
Change-Id: I61c2294c969fc0bc8cf6e6f05b4317c164ac596d