[automerger skipped] Merge "Split out the ipsec API surface and use framework-connectivity-tiramisu" am: 5edd77be am: 7dc8a7f5 am: 56313350 am: c268c993 -s ours

am skip reason: Merged-In I6cc8aef6a0ab9ce4bcef2797196b1d1b3687acca with SHA-1 1dad7aa0 is already in history

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

Change-Id: I4fdbc44085997514392d3f87b359b35cc9003191