Merge "Fix issue #5163456: logspam/tight loop in BatteryStatsImpl"