Merge "Fix NPE with contact cache, and guard against race condition." into ub-contactsdialer-a-dev
am: f668446893

* commit 'f6684468934c22535db692c5f7472d8c8f012f40':
  Fix NPE with contact cache, and guard against race condition.
tree: e0a41850079c1bb678799e9903cea00e2bffe116
  1. InCallUI/