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

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

Change-Id: Ie48a8b2cece8859184bcfe3541ef90ee1e4631f9