Merge changes from topic "stk_carrier_config"

* changes:
  Replace SubscriptionManager.getSubId() with other method
  Retrieve appropriate carrier configuration associated with SIM card