Merge "Add fields for PhoneAccount to CallerInfo"