am 935b031e: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/providers/ContactsProvider into eclair-mr2-plus-aosp

Merge commit '935b031eb6808ddc4c9b079437421a6c70fc2bcf'

* commit '935b031eb6808ddc4c9b079437421a6c70fc2bcf':
  [Issue 2171774] Fixing the fixStructuredNameComponents() method