Merge "Remove usage of hidden API PhoneConstants.SUBSCRIPTION_KEY"