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

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

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