Merge "Revert "Changes needed to make Incoming calls work while fbe locked"" into ub-contactsdialer-b-dev