[automerger skipped] Merge "Revert "Disable NetworkStatsHistory builder test in tm-dev"" into tm-dev am: dbe1bc1034 -s ours

am skip reason: Merged-In I47fb59334d00ae7fee91c5694548b3cf89b09b2d with SHA-1 516d5dc0ea is already in history

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

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