am aec68d53: am 0a7bc1c4: am ac679af9: Pass the preferred photo ID into the contact editor

* commit 'aec68d53ead7be1e2be560d6964ad4e2ca938250':
  Pass the preferred photo ID into the contact editor