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