Merge "Merge "AudioService: fix cancelMuteAwaitConnection" into tm-dev am:...

Merge "Merge "AudioService: fix cancelMuteAwaitConnection" into tm-dev am: e651a60d am: ec82ce0c" into tm-d1-dev-plus-aosp am: b3d86d22 am: c74e2feb

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



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