Set distinct USB configs for ADB/ADB+MTP

Change-Id: Ib071a4c6180482d75cc3e6a180ae65370491db20