Merge "Revert "UsbTest uses UsbDebuggingActivityAlias"" into oreo-mr1-cts-dev am: afb75cecbd
am: 8f3e3d7985

Change-Id: If97decf7df0a6cefa3dbb25dbd4d9607b10f712c