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

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

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