Merge "Add KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT in CarrierConfigManager" am: e22b680c9c

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

Change-Id: I91cfa202a58eb6adb33e7cd3b9140c4677e103df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>