Merge "Do not clear activity type in clearSizeCompatMode" into tm-qpr-dev

services/core/java/com/android/server/wm/ActivityRecord.java

@@ -8035,7 +8035,13 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
         }
 
         // Clear config override in #updateCompatDisplayInsets().
-        onRequestedOverrideConfigurationChanged(EMPTY);
+        final int activityType = getActivityType();
+        final Configuration overrideConfig = getRequestedOverrideConfiguration();
+        overrideConfig.unset();
+        // Keep the activity type which was set when attaching to a task to prevent leaving it
+        // undefined.
+        overrideConfig.windowConfiguration.setActivityType(activityType);
+        onRequestedOverrideConfigurationChanged(overrideConfig);
     }
 
     @Override