Merge "Revert "temporarily remove abort() to facilitate debugging"" am: a0ea747183

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

Change-Id: I7ac1c98b9a6d0caac8cc6b2b3fe81376ee1ea2f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>