Display contact name and number when reviewing identity keys

Previously, the "review identity keys" screen was displaying only the
contact name.  This isn't very useful for people that have multiple
phone numbers.  This change displays the name and number if we have
both.

Change-Id: I9f63c754022133e88fe18d7f0011437516286e43