am f744cdc6: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/providers/ContactsProvider into eclair-mr2-plus-aosp

Merge commit 'f744cdc6e29290e29aee894e952fcb762cc94f05'

* commit 'f744cdc6e29290e29aee894e952fcb762cc94f05':
  [Issue 2176922] Raising aggregation suggestion threshold for email addresses from 0.82 to 0.95
  [Issue 2163519] Making ContactsProvider2 honor the super-primary flag on a photo