Merge "Fix cts test in DumpsysHostTest#testBatteryStatsOutput" into mnc-dev