Merge "Remove hidden API usage: PhoneConstants.PHONE_KEY"