Merge "Include IkeTunnelConnectionParams in #hashCode and #equals" am: 320056b32d

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

Change-Id: I526ef18d1a2275455a63030f1624ec431eddf142