Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7

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

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

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

@@ -2627,6 +2627,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();