Merge "Add ConnectivityManager.unregisterNetworkCallback(PendingIntent) API" into mnc-dev