Merge changes I2dd58db1,I6cf55ad4

* changes:
  Refactor CallerInfo and ContactInfoHelper to improve readability.
  Move TelecomCallUtil to com.android.dialer