[automerger skipped] Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev am: 4ba373fe am: 3163ad26 -s ours

am skip reason: Merged-In Ia9f58c5986c717cb2882e2fc4daadb2b3874c6b5 with SHA-1 45efdc4e is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/14943952

Change-Id: Ia36eb3e5adb63ae2b6695958c1aa0e3b5afaf0da