Merge "Cleanup enterprise feature in ContactUtil am: e2ccf8bff5 am: 50357f8877" into nyc-mr1-dev-plus-aosp
am: f921d2f265

* commit 'f921d2f2656ddf8a983f7bd8280e0059be4a1e3e':
  Cleanup enterprise feature in ContactUtil

Change-Id: I86764be9d4df7e79d7498efdf83fb3adf9d45b4d