Merge "Fix CEC init twice in normal boot" am: 1d1c6ae770 am: 158f098e07

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdfc0e4788cecc3a358d358e1141ad2b3246deba

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

@@ -555,7 +555,7 @@ public class HdmiControlService extends SystemService {
     private void bootCompleted() {
         // on boot, if device is interactive, set HDMI CEC state as powered on as well
         if (mPowerManager.isInteractive() && isPowerStandbyOrTransient()) {
-            onWakeUp();
+            mPowerStatus = HdmiControlManager.POWER_STATUS_ON;
         }
     }