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

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

Change-Id: Ie485c2700c99031be123096ee905986b4855e1da