Merge "Revert "UsbTest uses UsbDebuggingActivityAlias"" into oreo-mr1-cts-dev
am: 29212549b9

Change-Id: I4306714299568886aff7f7f57d6c1dde0e5ab16a