Merge "usb: composite: Draw 900mA on USB resume if speed is super-speed" into msm-4.8