[automerger skipped] Merge "Refact the allowed network type" am: 13e676f60c am: c0f3c5b822 am: 2226edbe6e -s ours am: 1fef2e05c9 -s ours

am skip reason: skip tag Change-Id Idc456b0a3d7504c95172a5960378cf5e25149649 with SHA-1 8c6e82ee1b is already in history

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

Change-Id: I3a0052b4e5e6f798c465081a46f63bca6659e277