[automerger skipped] Merge "emulator: disable setting NR as network type" into sc-dev-plus-aosp am: 09f16a3e3f am: bbd2415936 -s ours am: 665c63607c -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: I92e7111e28937f009c8c29e9c8f77aef466a868f
This commit is contained in:
Android Build Prod User
2021-08-25 22:52:56 +00:00
committed by Automerger Merge Worker

Diff Content Not Available