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

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

Change-Id: I76da55ac994f143a699540896a3b7b19c10e9e53