Merge "Fixed NPE during monkey testing."

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

@@ -749,6 +749,9 @@ final class ActivityRecord implements AppWindowContainerListener {
     }
 
     void removeWindowContainer() {
+        // Resume key dispatching if it is currently paused before we remove the container.
+        resumeKeyDispatchingLocked();
+
         mWindowContainerController.removeContainer(getDisplayId());
         mWindowContainerController = null;
     }