[automerger skipped] Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f am: bbd2415936 -s ours
am skip reason: Merged-In I605f1abf8d3981fd9e962acbb0a9bcdd8c420c1c with SHA-1 fe83c41c1d is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/15672033
Change-Id: Ib82f6fa044be6ea79a63bb110ab6a6ec0364967b
This commit is contained in:
committed by
Automerger Merge Worker
commit
665c63607c