Merge "deflake android.net.cts.NetworkStatsManagerTest#testUidTagStateDetails" am: bc37a4b004

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

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