Merge changes from topics "mergedNetwork", "wifiInfoSubId"

* changes:
  Add API to get Subscription Id
  [Suggestion] API to set carrier merged network
tree: d63ff981ebc26ee0792b7364782c594079296090
  1. framework/
  2. OsuLogin/
  3. OWNERS