[automerger skipped] Skip duplicate parameters when IkeTunnelConnectionParams...

[automerger skipped] Skip duplicate parameters when IkeTunnelConnectionParams provided am: 2ed1cda8 -s ours am: a271b458 -s ours

am skip reason: Merged-In I510c47e26feabd5cebe9497ef495e4d729d0f7c6 with SHA-1 84afc69b is already in history

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



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