Merge "Fix BatteryStatsDumpsysTest#testBatterystatsOutput"