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

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

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