Set distinct USB configs for ADB/ADB+MTP

Change-Id: Id416cfc844f60b18ef72e8fedef7a344a752a79d