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: Idea14e5f92ad7f3d391df774b70425783482709d