Merge "Add experimental support for IPsec tunnel aggregation" am: e9b6b197

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



Change-Id: I0b5ea050846b3e20bc8f0729c91bf6d6692c216d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>