am b65eacf9: Merge change 25407 into eclair

Merge commit 'b65eacf9d7ce61e555ccc4261eab2cb2bf08d059' into eclair-plus-aosp

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