Merge "Merge "USB: update logic for reporting playback and capture capability...

Merge "Merge "USB: update logic for reporting playback and capture capability of USB devices." into udc-dev am: 52b52616 am: 829ae5cb" into udc-d1-dev-plus-aosp am: a9d55645

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22860174



Change-Id: I02e809e176fda8169b60b65cbc15bdb4e9213c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>