[automerger skipped] Merge "Update setSubscriptionOverride API to allow network types" into rvc-qpr-dev-plus-aosp am: 707d05ce -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic6472ac6f2dd11a15fc9c440552e2293901f0ec6