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