Merge "Revert "UsbTest uses UsbDebuggingActivityAlias"" into oreo-mr1-cts-dev