Merge "Fix a possible system server crash" into sc-dev am: 63fd8aebbd

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

Change-Id: Id836300346ba9e31e7832ee92d484b8834209079