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

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

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