Merge "Do a null check before returning the primary providers" into udc-dev

                mContext, Settings.Secure.CREDENTIAL_SERVICE_PRIMARY,

                /* isMultipleMode= */ true);

        String[] serviceNames = resolver.readServiceNameList(resolvedUserId);

        if (serviceNames == null) {

            return new HashSet<String>();

        }

        return new HashSet<String>(Arrays.asList(serviceNames));

    }