Merge "deflake android.net.cts.NetworkStatsManagerTest#testUidTagStateDetails" into main am: 80383822b1

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3001079

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