Merge "Remove resuming activity from stopping"

        if (mResumedActivity == next && next.isState(RESUMED)

                && taskDisplayArea.getWindowingMode() != WINDOWING_MODE_FREEFORM

                && taskDisplayArea.allResumedActivitiesComplete()) {

            // The activity may be waiting for stop, but that is no longer appropriate for it.

            mStackSupervisor.mStoppingActivities.remove(next);

            // Make sure we have executed any pending transitions, since there

            // should be nothing left to do at this point.

            executeAppTransition(options);