Correctly pass photo data to contact editor

This preserves existing behavior of always going through the same
Create new contact or add to existing contact flow, but correctly
passes the photo into the contact editor.

Bug: 11168659
Change-Id: Ie8b249cf6d1825f72b884b5eea1e0b465998d111