Merge "Crash bad callers earlier" am: 7a30d04659

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

Change-Id: Id32847468921b060b2a7607f598ff801d84fa2f7