[automerger skipped] Merge "Use lower of IPv4/IPv6 MTU values based on config"...

[automerger skipped] Merge "Use lower of IPv4/IPv6 MTU values based on config" am: 86540511 am: 83c9f5b9 am: c4cf296c am: 2ad547fe -s ours

am skip reason: Change-Id I079c8bc8c6fa11485ff16882e14587290b606deb with SHA-1 9998845a is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1402264

Change-Id: Ife81ff86d8ea4d038c3ca61a26fca3c0c7fba8e1