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

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

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