Fix missing encoding attribute on FN field.

When FN field is built from display name, the encoding attribute is missing.
Created common method to build N and FN fields so they will not be out of
sync in the future.

Bug: 7292017
Change-Id: I7faceb316b639d626a54bdd455df1e748b22face
Allow importer to handle missing encoding attribute for FN.

- Removed separators from FN properties.
- Adding fix on importer side since we cannot fix exporters that already exist.

Bug: 7292017
Change-Id: I61c691c24828e63aac1920384e16461da7a03881
am d5a731fa: (-s ours) Fix missing encoding attribute on FN field.

* commit 'd5a731faf1f749ad7031c13ca5a8cdb516c79b72':
  Fix missing encoding attribute on FN field.
am 8aa2ab8a: Allow importer to handle missing encoding attribute for FN.

* commit '8aa2ab8a2f4284cdbc9392e8597ab6d4fd302c50':
  Allow importer to handle missing encoding attribute for FN.
am 7a2ac040: Store encoding in upper case.

* commit '7a2ac0405decebde94bb4e3a139d62162e6e15a0':
  Store encoding in upper case.
Merge tag 'android-4.3_r2.1' into jellybean-mr2.1

Android 4.3 release 2.1