Merge "Fix crash after revoking all app permissions" into ub-contactsdialer-h-dev am: 4ab7c1d45d
am: 0eb5e66420

Change-Id: I0e13ec480ea6ea285536888e1199138161805a2c