tree cf3e64e93e074dc4a03ef89768c3f125a755710e
parent e2659b3350bc099e7bc5c7ce56394d6a650c2654
parent e22b680c9cb92bcd6aa82ba6601abda2773e1f28
author Chiachang Wang <chiachangwang@google.com> 1671590305 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1671590305 +0000

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>