Merge "AudioService: more communication mode fix" into rvc-qpr-dev am: 4ffe2081e8

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

Change-Id: I41c761a17858bef03d4b9ae656c9518c7e45b64b