Merge "BatteryStats: Record suspend abort reasons" into mnc-dev