Merge "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: 90a165b680  -s ours
am: eefb6cc8a4  -s ours

Change-Id: I2f547e6183d47b28444208fc0dc2ec970e75fb42