Merge "Minor TextClassifier fixes" into pi-dev

     */

    public static final class Builder {

        @NonNull private String mText;

        @NonNull private List<RemoteAction> mActions = new ArrayList<>();

        @NonNull private final Map<String, Float> mEntityConfidence = new ArrayMap<>();

        @Nullable Drawable mLegacyIcon;

        @Nullable String mLegacyLabel;

        @Nullable Intent mLegacyIntent;

        @Nullable OnClickListener mLegacyOnClickListener;

        @Nullable private String mText;

        @Nullable private Drawable mLegacyIcon;

        @Nullable private String mLegacyLabel;

        @Nullable private Intent mLegacyIntent;

        @Nullable private OnClickListener mLegacyOnClickListener;

        @Nullable private String mId;

        /**

        /**

         * @return The config representing the set of entities to look for

         * @see #setEntityConfig(TextClassifier.EntityConfig)

         * @see Builder#setEntityConfig(TextClassifier.EntityConfig)

         */

        @Nullable

        public TextClassifier.EntityConfig getEntityConfig() {