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

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

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