Merge "Merge \\"BatteryStats: record best estimated battery capacity\\" into nyc-dev am: c2e06a55f9 am: 145e50243e" into nyc-mr1-dev-plus-aosp