Merge "Revert "Add config to use lower of IPv4/IPv6 MTU values"" am: c4631dca14 am: e876040336

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

Change-Id: I639b4abbe3c55be6803ba7c9fc2584d1aaf93c87