Merge "Remove hidden API usage: PhoneConstants.PHONE_KEY" am: 0f0a9736 am: 451a27e3 am: 9ee00065 Change-Id: I71084784c85705cba5155bda64c7c89ae6f3edc7