Merge "Fix flaky testUidTagStateDetails" am: 8ac7ad4d9a am: ce1edecb68

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

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