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