Merge "Fix accounting bug in BatteryStatsImpl." into qt-dev am: 64096f1e78
am: 100a5f9701

Change-Id: Ic11193150a7da402bde1791a59b9cd936e984b88