[automerger skipped] Merge "Clear mInterface before calling resetIkeState()" into rvc-dev am: 7ba3a378c5 am: 1f68b323f3 am: 59378118d7 am: 6b1bf26b0b am: 2eb95344c5 -s ours
am skip reason: Merged-In I7f9a1d9afd2a40762e9fac68edf1fb8ae75df8bc with SHA-1 520cc2fde3 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18279994
Change-Id: I08f169e98cde7f32b63143b2ee370b290c2775bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: