Merge "Clear mInterface before calling resetIkeState()" am: 1d5282f4dd am: a093773ca5 am: c5bdf9b7a4

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

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