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

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

Change-Id: Iccc8e7325eed46b0ee8adb46e60ad4ae5067f753