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

* commit 'aec1e485f4cd55faa44191cd239e08cd0028e853':

Change-Id: I9fb18be9926f4210fa816fd4950c7e658d1f699f