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: Id779e7c46b605a34155a17e36930eee4f8125071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>