Merge "Add phone numbers to NotificationRecord from a cached contacts lookup" into tm-qpr-dev