Set distinct USB configs for ADB/ADB+MTP

Change-Id: Ia9aabd81d015134419c50598e40311e93d285ffe