Merge "Dynamically calculate IKEv2/IPsec VPN MTU" am: 0cadebbc28 am: 7a6ea59f37 am: 20aa76e36e

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

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