Merge "UsbTest - changed the way dialog is triggered" into stage-aosp-oc-mr1-cts-dev am: 5c6bc50eca am: 31fb20fce8
am: e6340282f5

Change-Id: Icbb545fa8bd38e5c93d31fba1c33020ed5f1bef8