Merge "Revert "temporarily remove abort() to facilitate debugging"" am: a0ea747183 am: 5ff877e3b7 am: 49e82435f0

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

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