Merge "Degrade a system crash to a Log.wtf" am: 807608edb6 am: 2c6cc63340

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

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