Merge "[DU09-3]Modify the NetworkStatsCollection Builder API" am: 3f5703df80 am: c36cb655e5

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

Change-Id: Ibcafcd8e69e4179a984ebb0fdf5a211d11407c97