[automerger skipped] Merge "AudioService: do not mute music systematically in...

[automerger skipped] Merge "AudioService: do not mute music systematically in setBluetoothA2dpOn" into 24D1-dev am: d8ad0deb -s ours

am skip reason: Merged-In If2494dc9db1252cf1afb6ffcd600553b8140a191 with SHA-1 e63e133e is already in history

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



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