Merge "[automerger skipped] Merge "DO NOT MERGE CTS bug : USB Audio Peripheral Attributes" into oreo-mr1-cts-dev am: 93faa4797b -s ours
am: c84b7861ea -s ours
am skip reason: subject contains skip directive

Change-Id: I4dc429aae4d7c94dc7a07e04fe3bbe035ca296bf