am 1bec54a5: Merge "Support editable 3p accounts without nicknames" into lmp-mr1-dev

                // as a part of StructuredName's fake KindSectionView, even though it uses a

                // different CP2 mime-type. We do a bit of extra work below to make this possible.

                final DataKind nickNameKind = type.getKindForMimetype(Nickname.CONTENT_ITEM_TYPE);

                if (nickNameKind != null) {

                    ValuesDelta primaryNickNameEntry = state.getPrimaryEntry(nickNameKind.mimeType);

                    if (primaryNickNameEntry == null) {

                        primaryNickNameEntry = RawContactModifier.insertChild(state, nickNameKind);

                    }

                    mNickName.setValues(nickNameKind, primaryNickNameEntry, state, false, vig);

                    mNickName.setDeletable(false);

                } else {

                    mPhoneticName.setPadding(0, 0, 0, (int) getResources().getDimension(

                            R.dimen.editor_padding_between_editor_views));

                    mNickName.setVisibility(View.GONE);

                }

            } else if (Photo.CONTENT_ITEM_TYPE.equals(mimeType)) {

                // Handle special case editor for photos

                final ValuesDelta primary = state.getPrimaryEntry(mimeType);