Merge "Fix crash when QuickContactActivity opened from dialer" into ub-contactsdialer-h-dev
am: 2a2cc48c03

Change-Id: I23f64092baf98345e3a273f2ccbadb024e3969de