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

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

Change-Id: I1546adf5a8e775dc7c5c3f06ba5ba187f3171ae4