Merge change 25407 into eclair

* changes:
  b/2121398 b/2089742 Fixed auto-complete when adding attendees (by updating to new contacts api)