Revert "Settings: Fix charging mode adb still enable issue"

This change is bogus and breaks the USB connection mode UX.
There is no reason to change the current USB connection
behaviour, hence revert to AOSP behaviour for this.

This commit also depends on the frameworks/base commit with
the change-id Ia61b341d5cd403f165d24257bab4148b1d9f4193.

This reverts commit 715ba29b.

Change-Id: Iad7d0811b7dcffe78c734c073dceb6c054fcea11