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

Change-Id: Iaf28d13be1e4f424f387fa0f563fc286c8323614