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