Merge "Small modifications to speedup ViewContactActivity Bug:2546767 - Use...

Merge "Small modifications to speedup ViewContactActivity Bug:2546767  - Use query parameter instead of sql string concatenation  - Try to use the ContactID that is passed in the Intent; fallback to lookup key if it is wrong (saves up to 2 queries)  - Initialize the newEntities list directly with the correct length" into froyo