Merge "Revert "Change default for group alert behavior"" into oc-dev

diff --combined core/java/android/app/Notification.java
index ad6b454,c626ae9..4dd71b4
--- 1/core/java/android/app/Notification.java
--- 2/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@@ -22,7 -22,6 +22,7 @@@ import android.annotation.ColorInt
  import android.annotation.DrawableRes;
  import android.annotation.IntDef;
  import android.annotation.NonNull;
 +import android.annotation.RequiresPermission;
  import android.annotation.SdkConstant;
  import android.annotation.SdkConstant.SdkConstantType;
  import android.annotation.SystemApi;
@@@ -1010,7 -1009,6 +1010,7 @@@ public class Notification implements Pa
       * @hide
       */
      @SystemApi
 +    @RequiresPermission(android.Manifest.permission.NOTIFICATION_DURING_SETUP)
      public static final String EXTRA_ALLOW_DURING_SETUP = "android.allowDuringSetup";
  
      /**
@@@ -1112,7 -1110,6 +1112,7 @@@
  
      /** @hide */
      @SystemApi
 +    @RequiresPermission(android.Manifest.permission.SUBSTITUTE_NOTIFICATION_APP_NAME)
      public static final String EXTRA_SUBSTITUTE_APP_NAME = "android.substName";
  
      /**
@@@ -1171,7 -1168,7 +1171,7 @@@
       */
      public static final int GROUP_ALERT_CHILDREN = 2;
  
-     private int mGroupAlertBehavior = GROUP_ALERT_CHILDREN;
+     private int mGroupAlertBehavior = GROUP_ALERT_ALL;
  
      /**
       * If this notification is being shown as a badge, always show as a number.