Merge "Removed improper check on mCalledExitCoordinator." into nyc-dev

    public void onResume(Activity activity, boolean isTopOfTask) {

        // After orientation change, the onResume can come in before the top Activity has

        // left, so if the Activity is not top, wait a second for the top Activity to exit.

        if (mCalledExitCoordinator == null) {

            return; // This is the called activity

        }

        if (isTopOfTask || mEnterTransitionCoordinator == null) {

            restoreExitedViews();

            restoreReenteringViews();