Fix mtp and usb charging when adb is off

Change-Id: I69e458bf02213aceb644f3c7f30982c3996c7511