[automerger skipped] Merge "Fix a possible system server crash" into sc-dev am: 63fd8aebbd -s ours

am skip reason: Merged-In I82a28c37450146838410bf5a059aac295a985fca with SHA-1 5bcc838f4e is already in history

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

Change-Id: I92fbf4ceca99dbe5679ce039ad524ffc56a87c51