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

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

Change-Id: I4729b601cd161f6506149ebb2d04429b8b8dbd63