Refactor CallerInfo and ContactInfoHelper to improve readability.

Test: Existing tests
PiperOrigin-RevId: 178862915
Change-Id: I2dd58db10d546c062b0f43dad80f74d588cb65e1
2 files changed