Merge "IconFactory should be initialized before mAdapter is created inside ResolverActivity"

package com.android.internal.app;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

import android.annotation.Nullable;

import android.annotation.StringRes;

import android.annotation.UiThread;

import android.widget.ListView;

import android.widget.TextView;

import android.widget.Toast;

import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.content.PackageMonitor;

import java.util.Objects;

import java.util.Set;

import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;

/**

 * This activity is displayed when the system attempts to start an Intent for

 * which there is more than one matching activity, allowing the user to decide

        mTitle = title;

        mDefaultTitleResId = defaultTitleRes;

        mIconFactory = IconDrawableFactory.newInstance(this, true);

        if (configureContentView(mIntents, initialIntents, rList)) {

            return;

        }

                : MetricsProto.MetricsEvent.ACTION_SHOW_APP_DISAMBIG_NONE_FEATURED,

                intent.getAction() + ":" + intent.getType() + ":"

                        + (categories != null ? Arrays.toString(categories.toArray()) : ""));

        mIconFactory = IconDrawableFactory.newInstance(this, true);

    }

    @Override