Merge "Fix remove-before-add for IpSecService RefcountedResource"

am: dcd06394d4

Change-Id: Ief286a54a93efd731deeff9fc32815663ab7695d

services/core/java/com/android/server/IpSecService.java

@@ -208,6 +208,7 @@ public class IpSecService extends IIpSecService.Stub {
                     mBinder.linkToDeath(this, 0);
                 } catch (RemoteException e) {
                     binderDied();
+                    e.rethrowFromSystemServer();
                 }
             }
         }