[automerger skipped] Merge "USB: update logic for reporting playback and capture capability of USB devices." into tm-qpr-dev am: 154475ba -s ours

am skip reason: Merged-In If1c14cc0a4e3fbdfbed2c105d37ece9a866f18ed with SHA-1 9a5cab13 is already in history

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



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