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

Change-Id: I9f5951264061e4f2034ad00774126dd8aff4d77f