Merge "DO NOT MERGE Disable UsbTest in CTSVerifier" into oreo-mr1-cts-dev