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

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

Change-Id: If1793308c68f21fbea69e32c1ee7742ceee3bee6