Merge "Revert "Changes needed to make Incoming calls work while fbe locked""...
Merge "Revert "Changes needed to make Incoming calls work while fbe locked"" into ub-contactsdialer-b-dev
am: d4947e51
* commit 'd4947e51':
Revert "Changes needed to make Incoming calls work while fbe locked"