Merge "Add config to use lower of IPv4/IPv6 MTU values" am: f29902285a am: 5d8f4ce92a

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

Change-Id: Ief7929253c9851f8ec047f5c5e173518d9c3dea9