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 am: 7ed5bbd78f
am: 3a050a9aec  -s ours

Change-Id: I12274cf33df51b8e0251fcaaf645e67ca19d99e6