[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: 6b1bf26b am: 2eb95344 -s ours am: 57836676 -s ours am: 2770c3c3 -s ours am: aa45f5f9 -s ours am: 62d95a9c -s ours

am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fd is already in history

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



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