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

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

Change-Id: Iddab205cf2754d326be816e6e8e92c2cc0b95771