Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378

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



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