[automerger skipped] Merge "AudioService: fix communication device APIs" into...

[automerger skipped] Merge "AudioService: fix communication device APIs" into tm-qpr-dev am: d5ead3ae am: f487738e -s ours

am skip reason: Merged-In I1fc0bc8a372d49b0fb6c8b25fd51fbcf321bab6f with SHA-1 1dea0dab is already in history

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



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