Merge "USB: EHCI: HSIC: Guard against late remote wakeup during suspend" into msm-3.0