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

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

Change-Id: I2196b0eb06642848679d147812eaf3d87285d493