Merge "Add a new boolean resource to reset the AirPlane mode after during boot." into sc-v2-dev am: f89a8fdefc

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

Change-Id: Ic23eddad3f5bf76802407e23bb842bf96c0b9a02

services/java/com/android/server/SystemServer.java

@@ -1587,6 +1587,9 @@ public final class SystemServer implements Dumpable {
             // all listeners have the chance to react with special handling.
             Settings.Global.putInt(context.getContentResolver(),
                     Settings.Global.AIRPLANE_MODE_ON, 1);
+        } else if (context.getResources().getBoolean(R.bool.config_autoResetAirplaneMode)) {
+            Settings.Global.putInt(context.getContentResolver(),
+                    Settings.Global.AIRPLANE_MODE_ON, 0);
         }
 
         StatusBarManagerService statusBar = null;