Merge "Correct the formula of battery capacity estimation. am: c800ddc824 am: d4d476943f" into nyc-mr2-dev-plus-aosp
am: c820fe9b16

Change-Id: I67798476c055da8f7ace2f0cc55071b66b4e9273