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

Change-Id: I29f5bd1a1a8fbb47b788a1c1557dc2b4bf759225