Merge "Merge "Correct the formula of battery capacity estimation. am: c800ddc8 am: d4d47694" into nyc-mr2-dev-plus-aosp am: c820fe9b"