[automerger skipped] Merge "Include IkeTunnelConnectionParams in #hashCode and...

[automerger skipped] Merge "Include IkeTunnelConnectionParams in #hashCode and #equals" into sc-dev am: 388e0cba -s ours

am skip reason: Merged-In I70182f9b645e55eced1e0a048a1bd87778c1c0f6 with SHA-1 16006a61 is already in history

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

Change-Id: I36d3012e8667bb5d7e4f2b8bcdcaac3d79c27ecf