[automerger skipped] Merge "Use NetworkStack instead of NetworkStackNext" into...

[automerger skipped] Merge "Use NetworkStack instead of NetworkStackNext" into sc-dev am: 4ba373fe -s ours am: 980167a5 -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: Ifa80306c3b790dd15a51123c6ec9893b1cc35557