Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569340

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3dc22a55c1de4b51927499d1d33b1aa66b8a752