Merge "Clear mInterface before calling resetIkeState()" am: 1d5282f4dd am: a093773ca5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2049444

Change-Id: Ie2fb4a49195574ac91609d269fc72585674e33d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/connectivity/Vpn.java

@@ -2692,6 +2692,9 @@ public class Vpn {
                         return; // VPN has been shut down.
                     }
 
+                    // Clear mInterface to prevent Ikev2VpnRunner being cleared when
+                    // interfaceRemoved() is called.
+                    mInterface = null;
                     // Without MOBIKE, we have no way to seamlessly migrate. Close on old
                     // (non-default) network, and start the new one.
                     resetIkeState();