Merge "Avoids setting package name while selector is set" into main

        // as the one in the task because either one of them could be the alias activity.

        if (Objects.equals(realActivity, r.mActivityComponent) && this.intent != null) {

            intent.setComponent(this.intent.getComponent());

            if (intent.getSelector() == null) {

                // Make sure the package name the same to prevent one of the intent is set while the

                // other one is not.

                intent.setPackage(this.intent.getPackage());

            }

        }

        return intent.filterEquals(this.intent);

    }