Merge "Ensure primary provider is contained in the list of enabled providers"...

import android.annotation.Nullable;

import android.annotation.UserIdInt;

import android.app.ActivityManager;

import android.provider.Settings;

import android.content.ComponentName;

import android.content.Context;

import android.content.pm.PackageInfo;

                            "setEnabledProviders",

                            null);

            Set<String> enableProvider = new HashSet<>(providers);

            enableProvider.addAll(primaryProviders);

            boolean writeEnabledStatus =

                    Settings.Secure.putStringForUser(getContext().getContentResolver(),

                            Settings.Secure.CREDENTIAL_SERVICE,

                            String.join(":", providers),

                            String.join(":", enableProvider),

                            userId);

            boolean writePrimaryStatus =