Merge "Revert "Temporarily disable testUidStatsForTransport"" into tm-dev am: 3481337b6b am: 82323124a0

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

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