Merge \"Merge \\\"BatteryStats: Record fine grained battery discharge\\\" into...
Merge \"Merge \\\"BatteryStats: Record fine grained battery discharge\\\" into nyc-dev am: 094c40b2 am: d499d79b\" into nyc-mr1-dev-plus-aosp
am: 26f4966b
Change-Id: Ib55fc7a5012a513c2c77221f3b00702cc3a790ec