[automerger skipped] Merge "Update setSubscriptionOverride API to allow...

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

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc704a20cdb84c696ec22033f57a331195234e1e