Merge "Fix a possible system server crash" am: 51176d0a67 am: d79bd5c622

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

Change-Id: Id71b3d6e530a053b1950ed9cecbf74a83b36b4e8