Merge "Handle revoked permissions when resuming the app (1/2)" into ub-contactsdialer-i-dev