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

* commit '45a66c09a96e76fe6b0ecec3390bf0cb88a9dfe1':
  Changes needed to make Incoming calls work while fbe locked