Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549

Change-Id: Idb1032b0e1513650da785866e85eef4bff64827f