Merge "Restore auto-launch behavior for ACTION_CHOOSER with a single choice"

        return true;

    }

    @Override

    boolean shouldAutoLaunchSingleChoice(TargetInfo target) {

        final Intent intent = target.getResolvedIntent();

        final ResolveInfo resolve = target.getResolveInfo();

        // When GET_CONTENT is handled by the DocumentsUI system component,

        // we're okay automatically launching it, since it offers it's own

        // intent disambiguation UI.

        if (intent != null && Intent.ACTION_GET_CONTENT.equals(intent.getAction())

                && resolve != null && resolve.priority > 0

                && resolve.activityInfo != null && DocumentsContract.PACKAGE_DOCUMENTS_UI

                        .equals(resolve.activityInfo.packageName)) {

            return true;

        }

        return false;

    }

    private void modifyTargetIntent(Intent in) {

        final String action = in.getAction();

        if (Intent.ACTION_SEND.equals(action) ||