Merge "Use CONTACT_METADATA_SYNC_ENABLED." into nyc-dev
am: b9082df14a

* commit 'b9082df14ae712c27d4fe663710e51cc7ae590db':
  Use CONTACT_METADATA_SYNC_ENABLED.

Change-Id: Ie20b9065ba3ede17abbbb75e8edfc1044b6cf195