Merge "Don't update volume in AudioService when SAM is on and ARC is off" am: 461594522b am: 2171996c65

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

Change-Id: I9f238154a1d5193c3a16c499f41e0c83a3af4819

services/core/java/com/android/server/hdmi/HdmiControlService.java

@@ -1289,6 +1289,7 @@ public class HdmiControlService extends SystemService {
     void setAudioStatus(boolean mute, int volume) {
         if (!isTvDeviceEnabled()
                 || !tv().isSystemAudioActivated()
+                || !tv().isArcEstablished() // Don't update TV volume when SAM is on and ARC is off
                 || !isHdmiCecVolumeControlEnabled()) {
             return;
         }