[DO NOT MERGE] Fix Dialer crash loop for caller id in personal contact directory am: 758ba199
am: 2e239bd4 -s ours
* commit '2e239bd4':
[DO NOT MERGE] Fix Dialer crash loop for caller id in personal contact directory
Change-Id: Ifb79cce1d9a33adaf4b9376c43c7fc286d8c0c9d