Merge "Add fields for PhoneAccount to CallerInfo" am: 833bc7dba7
am: 5c8e7355c0

Change-Id: I27b8b353ae912cb9e301645aadcdd4433a761553