Merge "Support NetworkStats#addEntries API" into main am: a7511c2318 am: 4aeb170730

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

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