Merge "Merge "[automerger skipped] Merge "DO NOT MERGE Relaxing "Mandated" peripheral requirements for CTSV USB Audio test." into oreo-cts-dev am: 22f7be5677  -s ours" into oreo-mr1-cts-dev am: fda0a03adc  -s ours" into pie-cts-dev
am: 7d1df49099  -s ours

Change-Id: I0e64d4537e93fd13d4589a175f6f1d11b5156ee6