Merge "AudioService: fix cancelMuteAwaitConnection" into tm-dev