Merge "Add API for VCN configuration of UDP port 4500 NAT Timeouts" am: c1bd048026 am: 48e1a31ddb am: 991147690c

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

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