Merge "If leash is null it's not a valid state to remove PiP" into udc-dev

     * Removes PiP immediately.

     */

    public void removePip() {

        if (!mPipTransitionState.isInPip() || mToken == null) {

        if (!mPipTransitionState.isInPip() || mToken == null || mLeash == null) {

            ProtoLog.wtf(ShellProtoLogGroup.WM_SHELL_PICTURE_IN_PICTURE,

                    "%s: Not allowed to removePip in current state"

                            + " mState=%d mToken=%s", TAG, mPipTransitionState.getTransitionState(),

                    mToken);

                            + " mState=%d mToken=%s mLeash=%s", TAG,

                    mPipTransitionState.getTransitionState(), mToken, mLeash);

            return;

        }