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

Change-Id: I3ed31b60aea692eb143be70ec6e76b5c43b22827