Merge "Add KEY_MIN_UDP_PORT_4500_NAT_TIMEOUT_SEC_INT in CarrierConfigManager" am: e22b680c9c am: 32dfee3c97

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

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