Merge "Fix flaky testUidTagStateDetails" am: 8ac7ad4d9a am: 7a070db8ef

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

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