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

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

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