Merge "Fix duplicated DataKinds for external account types"

        iconRes = resolveExternalResId(context, mAccountTypeIconAttribute,

                this.resPackageName, ATTR_ACCOUNT_ICON);

        if (!mHasEditSchema) {

            // Bring in name and photo from fallback source, which are non-optional

            addDataKindStructuredName(context);

            addDataKindDisplayName(context);

            addDataKindPhoneticName(context);

            addDataKindPhoto(context);

        }

        // If we reach this point, the account type has been successfully initialized.

        mInitSuccessful = true;