Merge "Revert "Disable NetworkStatsHistory builder test in tm-dev"" into tm-dev am: dbe1bc1034

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

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