Merge "Revert "DO NOT MERGE disable UsbTest"" into oreo-mr1-cts-dev