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

* commit 'd4947e51b0b3336ff9da03275ff48a7632fe0268':
  Revert "Changes needed to make Incoming calls work while fbe locked"