Merge "Search enterprise directory as well in SMS app am: b7fc988f23 am: f302d0cd2f" into nyc-mr1-dev-plus-aosp
am: 2b7f72f705
* commit '2b7f72f7055eca895959e7efdd39cb450b7cc6f4':
Change-Id: If896cfe8caa57ce0d0ac5573b36d35ff59cfa8c2
This commit is contained in: