Merge "Switched out PhoneConstants.PhoneKey" am: 2be788e16d

Change-Id: I20b9dc002d036d65871913a8d0d905a0c823232b