Merge "Unregister configuration listener after the WindowProcessController was disallowed to be overridden."

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

@@ -1547,7 +1547,9 @@ public class WindowProcessController extends ConfigurationContainer<Configuratio
                 // activity as it could lead to incorrect display metrics. For ex, IME services
                 // expect their config to match the config of the display with the IME window
                 // showing.
+                // If the configuration has been overridden by previous activity, empty it.
                 mIsActivityConfigOverrideAllowed = false;
+                unregisterActivityConfigurationListener();
                 break;
             default:
                 break;