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: 5f6ec2a1
* commit '5f6ec2a1':
Change-Id: I09ab4a0727d01eda42e27cb97748a5c531afbd8f