Merge "Crash bad callers earlier" am: 7a30d04659 am: ad329392a7 am: c04b1e707f

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

Change-Id: I208aad86a1315e452f723eb1d130d9af2bbd5693