Merge "emulator: disable setting NR as network type" am: 2f2313d01c am: b2f5d3e98c am: 5167da569d am: 6cb9946598
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15684870 Change-Id: I2acaae9b85e09770b7f09cd971f6ee95588f812e
This commit is contained in: