[automerger skipped] Merge "Skip duplicate parameters when...

[automerger skipped] Merge "Skip duplicate parameters when IkeTunnelConnectionParams provided" into tm-qpr-dev am: e2494469 -s ours am: d8d63b53 -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: I9a07a8ab06e0cfe23bbf1e2eae19facef46d6aed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>