Merge "Catch exception of unregisterNetworkCallback" am: 740cda4358 am: 9e6b732a17

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

Change-Id: I236faafdd55dd8aaad5cff2ab5b310e0e653276b