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

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

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