Merge "Revert "Use addEntries when creating NetworkStats"" into main am: d7f925facc am: 5538cd78ba

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

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