am e19d06c1: Merge change I92d49bcd into eclair

Merge commit 'e19d06c177b1872e89db3a86f227908bfee9cc19' into eclair-mr2

* commit 'e19d06c177b1872e89db3a86f227908bfee9cc19':
  [Issue 2163519] Making ContactsProvider2 honor the super-primary flag on a photo