Merge changes from topic "am-fce087d57bff47aebaa4d4bcbc8a856e"

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