Merge "Add NR network type to "Global" mode preference" into r-keystone-qcom-dev