Merge "Revert "USB: android: Avoid re-enabling the same configuration"" into msm-3.4