Merge "Only play sound effects if stream is not muted." am: f18982cc19 am: 961977fbb7

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

Change-Id: I1cb7407a615b07dc5c7d6ed715dbe01690c45381

services/core/java/com/android/server/audio/AudioService.java

@@ -3987,7 +3987,7 @@ public class AudioService extends IAudioService.Stub
     /** @see AudioManager#playSoundEffect(int, float) */
     public void playSoundEffectVolume(int effectType, float volume) {
         // do not try to play the sound effect if the system stream is muted
-        if (isStreamMutedByRingerOrZenMode(STREAM_SYSTEM)) {
+        if (isStreamMute(STREAM_SYSTEM)) {
             return;
         }