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

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