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