Merge "Apply a workaround, and try to detect a system crash" am: 65571769cd

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

Change-Id: I0fc4d9408438fa5d0da810ae710e6c92d821b8a5