[DO NOT MERGE] Fix Dialer crash loop for caller id in personal contact directory am: 758ba19
am: 2e239bd  -s ours

* commit '2e239bd445fb3582e0faa096c7e9ec8c4d08e003':
  [DO NOT MERGE] Fix Dialer crash loop for caller id in personal contact directory

Change-Id: Ifb79cce1d9a33adaf4b9376c43c7fc286d8c0c9d