Merge "Fix memory access violation in NetworkStack" into sc-dev am: 1dc094b2c0

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

Change-Id: Ie1eca928523704673fb42870df01644b215252de