Merge "Fix deadlock issue in BatteryStatsHelper."