tree 09ab0dddf71c90b589be6b832661fd523193a8c7
parent 0e113d98d2d34d383d368d773cc1e8eb48eff5a0
parent 78d3cf2c474616f212776c84b0a66a9522713b77
author Yan Yan <evitayan@google.com> 1732241937 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1732241937 +0000

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>