Revert "USB: android: Avoid re-enabling the same configuration"

It broke "adb root"

This reverts commit d9b1897713919ad89b724f751bc2c722bf4b73ce.

Change-Id: I6596f26d58cc0a0bb3ead26fbf922cec8d0f89e0