Merge "Refix "emulator: disable setting NR as network type"" into sc-dev-plus-aosp