Merge "USB: msm_otg: Fix race between PM resume and charger detection"