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

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

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