Merge "Better errors from unregisterNetworkCallback"
am: 04e89ad631

Change-Id: Icbd68ff14db55c6546c7de6353774a3622b32f9e