Merge "Catch exception of unregisterNetworkCallback" am: 740cda4358

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

Change-Id: I922ac12c29cd1539c9c284af6adb556bfe0d5976