[Issue 2171774] Fixing the fixStructuredNameComponents() method

This is effectively a revert of change dd0e0f44fe403ff201d46d5534f7f1148e5ad729
followed by a proper fix for:
[Issue 2160728] Fixing full name update when parts of structured name are deleted

Change-Id: I96e990820938ee79a87411eb926d774c951fa768
2 files changed