Merge "Remove hidden API usage: PhoneConstants.PHONE_KEY" am: 0f0a97368a am: 451a27e3e9

Change-Id: I69eab9f3be406621d1a90f86ee17449b46b6cbb3