Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870

Change-Id: I0cb86918fd5b5eb31ed633cc7dddcea12c125bd4