Merge "Only allow clearing NAT timeout when the 25Q2 flag is enabled" into main am: 78d3cf2c47

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

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