am 5cd293b3: Merge "Merge commit \'91d2cbf4\' into manualmerge" into mnc-dev

* commit '5cd293b37946ccc60c148e4a17e5f59620999046':
  Only enable theater mode by button press after setup.

services/core/java/com/android/server/policy/PhoneWindowManager.java

@@ -1039,6 +1039,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             case MULTI_PRESS_POWER_NOTHING:
                 break;
             case MULTI_PRESS_POWER_THEATER_MODE:
+                if (!isUserSetupComplete()) {
+                    Slog.i(TAG, "Ignoring toggling theater mode - device not setup.");
+                    break;
+                }
+
                 if (isTheaterModeEnabled()) {
                     Slog.i(TAG, "Toggling theater mode off.");
                     Settings.Global.putInt(mContext.getContentResolver(),