Merge "Contacts: Fix NPE in QuickContactActivity in monkey test" am: 6529af3c9c am: a33aca875a
am: a90442f350

Change-Id: Ie3b8420c3d8818cad927010eb0c5244b64631fb9