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

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



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