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

* commit '843b77de175fe038f025e6eb33a579eff944cb36':
  Use CONTACT_METADATA_SYNC_ENABLED.

Change-Id: I42a330ee121872f2b93c76afb1d6183bc5a02e65