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

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

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