Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1715797

Change-Id: I659fb171fd5e3851cad8f9bcc6bacfea908a2125