Merge "AudioService: fix cancelMuteAwaitConnection" into tm-dev am: e651a60d am: ec82ce0c

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



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