Merge "cec: Reset system audio mode status carefully [2/2]" am: ec04d57b0b am: 82ef50b043 am: f386b1c383

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

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

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

@@ -110,7 +110,8 @@ public class HdmiCecLocalDevicePlayback extends HdmiCecLocalDeviceSource {
                     new SendMessageCallback() {
                         @Override
                         public void onSendCompleted(int error) {
-                            if (error != SendMessageResult.SUCCESS) {
+                            // In consideration of occasional transmission failures.
+                            if (error == SendMessageResult.NACK) {
                                 HdmiLogger.debug(
                                         "AVR did not respond to <Give System Audio Mode Status>");
                                 mService.setSystemAudioActivated(false);