Merge "Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: ddfb09b5af am: 55c30b2d7f" into nyc-mr1-dev-plus-aosp
am: 7d984c00c6

* commit '7d984c00c6f919e12cce544f88bc2518d4267a26':

Change-Id: I6b23a15e630a899658f21058e718d793fdec1c2a