Merge "Fix flaky testUidTagStateDetails" am: 8ac7ad4d9a am: ce1edecb68 am: 34a2146eba am: 0100c75c57 am: 34d5bdf41c am: 835d5c9e9a

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

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