Merge "Refact the allowed network type" am: 13e676f60c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1642003

Change-Id: I6f5d19d16c6dc4434388117d69635e58c6337801