[automerger skipped] Use non-next NetworkStack am: 8f559e09 -s ours am: fb756e5b -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: I428560c12767ecc4da271b3b2e072c50075d2e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>