am f2db7d5d: Merge "Attach aggregation listener to super primary name field" into mnc-dev

                    rawContactDelta, StructuredName.CONTENT_ITEM_TYPE, dataKind);

            if (superPrimaryValuesDelta != null) {

                // Our first preference is for a non-empty super primary name

                final NameEditorListener nameEditorListener = new NameEditorListener(

                        superPrimaryValuesDelta, rawContactDelta.getRawContactId(), mListener);

                mNames.addView(inflateStructuredNameEditorView(mNames, accountType,

                        superPrimaryValuesDelta, rawContactDelta, /* nameEditorListener =*/ null));

                        superPrimaryValuesDelta, rawContactDelta, nameEditorListener));

                return;

            }

        }