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

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



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