Merge "Merge "AudioService: fix BT SCO volume mute" into tm-qpr-dev am:...

Merge "Merge "AudioService: fix BT SCO volume mute" into tm-qpr-dev am: 77c92478 am: e5a19023" into udc-dev am: 67f57149

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



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