Merge "Update setSubscriptionOverride API to allow network types"