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

Change-Id: I2b1712e6b8158b3ea1b9ed8411b6fb9a0ab5481d