Merge "BatteryStats: Read /proc/wakelocks first before trying /d/wakeup_sources" into mnc-dev