Merge "Fix memory access violation in NetworkStack" am: fc592e8bc0 am: d417b64774 am: 705d0a9644

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

Change-Id: I3fa37993e3af019b82b96944342bd9fba6f3b0a5