Merge "Add NR to preferred network type combination"
am: 996f047394

Change-Id: I6587a17e035136f5adb0b40445676aac075207ab