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

Change-Id: I71084784c85705cba5155bda64c7c89ae6f3edc7