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

Change-Id: Ic6754ba109dc161c1d787e9e08ce531e7f150a06