Merge "Add wifi direct service discovery test to CtsVerifier."