Merge "Clear task bounds data when removing non-bounds persistable task."

        if (!moving) {

            mStackSupervisor.removeLockedTaskLocked(task);

            mWindowManager.removeTask(task.taskId);

            if (!StackId.persistTaskBounds(mStackId)) {

                // Reset current bounds for task whose bounds shouldn't be persisted so it uses

                // default configuration the next time it launches.

                task.updateOverrideConfiguration(null);

            }

        }

        final ActivityRecord r = mResumedActivity;