[automerger skipped] Merge "Clear mInterface before calling resetIkeState()"...

[automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378 am: 1f68b323 am: 59378118 am: 054b17e9 -s ours am: cf65e890 -s ours am: 527a4f9f -s ours

am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 65d44b93 is already in history

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



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