[automerger skipped] Merge "Revert "Disable NetworkStatsRecorder Test"" into tm-dev am: 5a02299084 -s ours am: 3fa6ee7aaf -s ours am: 5eac5ba276 -s ours am: dbc8c9c2b6 -s ours

am skip reason: Merged-In I47fb59334d00ae7fee91c5694548b3cf89b09b2d with SHA-1 516d5dc0ea is already in history. Merged-In was found from reverted change.

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

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