tree a21e72b5902094e774c5b08ca55e8f1bf3ee5b30
parent 5a329735564ac2075cc57d76042ee746bd1ed03f
parent 22f7be5677dae08d04f2e254fbec3da2739c8be8
author Paul McLean <pmclean@google.com> 1537298834 -0700
committer android-build-merger <android-build-merger@google.com> 1537298834 -0700

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

Change-Id: I0c3e95a57eb34a4f8c738581832a46091532229f