Merge "Honor the user setting MANAGED_PROFILE_CONTACT_REMOTE_SEARCH" into nyc-dev
am: 40bd9994e1

* commit '40bd9994e10f85c2c4acf2647f042b8a72dcdcef':
  Honor the user setting MANAGED_PROFILE_CONTACT_REMOTE_SEARCH

Change-Id: I434aa096bfeef2e04735792344f54c9b7176559a