[automerger skipped] Merge "Add config to use lower of IPv4/IPv6 MTU values" am: f29902285a am: 5d8f4ce92a am: c6fce99ab5 am: 9a11a4c5a3 -s ours am: 3160e6971c -s ours

am skip reason: Change-Id Ic0afdfabec3a13a4a1d3fd34e7e02d4df3a06ea5 with SHA-1 dc7260ad33 is in history

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

Change-Id: I27ede6ac1684f42b314d3dcc360c4d096153a0e7