Merge "Update setSubscriptionOverride API to allow network types" into rvc-qpr-dev-plus-aosp