[automerger skipped] Merge "Fix memory access violation in NetworkStack" into sc-dev am: 1dc094b2c0 am: 00c47e1c5a -s ours
am skip reason: Merged-In I9d8ec0708efd747e24b3b3ffed5336434d4f64a7 with SHA-1 365ada7e04 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/14713334
Change-Id: I1a477c5f743b82b63ffe6cb569e92abb9dd12d90
This commit is contained in: