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

* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
  BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I45d04bb852bf995b4f246fce3782dbeecafe24e4