[automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" am: 1c600eed49 am: 3cde1b28c9 -s ours

am skip reason: Change-Id Ie196db5e236e478f1c29c3dfd1ca31acc205c54b with SHA-1 9762f014fa is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I19d551d9f9c517f553af103b54ce615b6502521e