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

[automerger skipped] Merge "Include IkeTunnelConnectionParams in #hashCode and #equals" into sc-dev am: 388e0cba am: e43a1de8 -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: I6abf72d3ce490981db782ace6320e194b1def1d7