Merge "Fix SaveUi to properly resolve for instant apps."

import android.content.Context;

import android.content.Intent;

import android.content.IntentSender;

import android.content.pm.ActivityInfo;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

                    return componentName;

                }

                intent.addFlags(Intent.FLAG_ACTIVITY_MATCH_EXTERNAL);

                return intent.resolveActivity(packageManager);

                final ActivityInfo ai =

                        intent.resolveActivityInfo(packageManager, PackageManager.MATCH_INSTANT);

                if (ai != null) {

                    return new ComponentName(ai.applicationInfo.packageName, ai.name);

                }

                return null;

            }

        };

        final LayoutInflater inflater = LayoutInflater.from(context);