system.prop: set usb.config=mtp,adb by default

Change-Id: I5df7ced7c343a8afc87ac2b46dd546ce95a16c78
Merge "system.prop: set usb.config=mtp,adb by default" into jellybean