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

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

Change-Id: I1c5022a399c4b1228df5268639f0536d313320a2