Merge "usb: ehci-msm: Prevent USB resume during system suspend"