Merge "BatteryStatsImpl: Fix parceling error"