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

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

Change-Id: Iaff0abe5a4720447244fd118141d6a9e8898f6ee