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

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

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