Merge \"Merge \\\"BatteryStats: record best estimated battery capacity\\\"...
Merge \"Merge \\\"BatteryStats: record best estimated battery capacity\\\" into nyc-dev am: c2e06a55 am: 145e5024\" into nyc-mr1-dev-plus-aosp
am: 480c737a
Change-Id: Icc8177c5d61efc2a535c0cec74fbce2c194b57fc