Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: 3a1468db12" into nyc-mr1-dev-plus-aosp
am: 62eb09d89e

* commit '62eb09d89e1a5da486818123deb4166d14bf4902':
  Search enterprise directory as well in SMS app

Change-Id: I406447201b20a0b1c1a0aaf29ba6b26fb8e234cc