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

* commit '61bd6fdc5c514f94ab96f6f36bdc469268622b21':
  Changes needed to make Incoming calls work while fbe locked