Merge "Prototype making expanded notification states optional again" into main

core/java/android/app/Notification.java

@@ -6490,7 +6490,8 @@ public class Notification implements Parcelable
         // visual regressions.
         @SuppressWarnings("AndroidFrameworkCompatChange")
         private boolean bigContentViewRequired() {
-            if (mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.S) {
+            if (!Flags.notificationExpansionOptional()
+                    && mContext.getApplicationInfo().targetSdkVersion >= Build.VERSION_CODES.S) {
                 return true;
             }
             // Notifications with contentView and without a bigContentView, style, or actions would

core/java/android/app/notification.aconfig

@@ -59,6 +59,13 @@ flag {
   bug: "335211019"
 }
 
+flag {
+  name: "notification_expansion_optional"
+  namespace: "systemui"
+  description: "Experiment to restore the pre-S behavior where standard notifications are not expandable unless they have actions."
+  bug: "339523906"
+}
+
 flag {
   name: "keyguard_private_notifications"
   namespace: "systemui"