Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev