Merge "Speculatively fix L2TP keepalive issues by reducing mtu" am: 392b52f49f

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

Change-Id: Iac7fc24c531db663469df1b1161d9f85a4c6f3ee