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

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

Change-Id: I43f31682afb2b1eda76cfad2eebb0a9d9a69ffdf