Use photoId of the raw contact in aggregation engine

Previously using the wrong selection for photoId, getting the id for
the whole contact instead of the one for raw contact.

Test: Verified the correct photo shows up in aggregation popup
when the raw contacts have different photos.

Bug: 33004690
Change-Id: I989b666f5c2782e33b6b5396ac89d56841144888