CB-5994 Switch Contact ID lookup to use Raw contact id.

When saving a contact it is the raw contact ID that is returned and so the check in ContactManager after the save needs to be using that.  This requires this change to work on 4.3/4.2.