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

Change-Id: I5eef76c4b0acd8d041b08c5babee9c6118bed979