[automerger skipped] Merge "Use non-next NetworkStack" into tm-dev am: 7c87090e -s ours

am skip reason: Merged-In I12348bd913f724c4675177ce6cdf582948d9d03c with SHA-1 b91d60cd is already in history

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



Change-Id: I784ea0f55c1acef6a85909a0fdb9f7a6b1918ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>