Merge "Add NR network type to "Global" mode preference" am: 19222f2154

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

Change-Id: I1714b765690ac43e77233752d31ef921219584f0