resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp

Change-Id: I99a29f920336b00b26b9aadafd2bd835049f48cf

services/java/com/android/server/ConnectivityService.java

@@ -1289,6 +1289,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
                     }
                     if (!teardown(otherNet)) {
                         loge("Network declined teardown request");
+                        teardown(thisNet);
                         return;
                     }
                 }