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

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

Change-Id: Idee66cfaec05391020420070ed8874b7b8c5f1bf