Merge "[DU09-2]Modify the NetworkStatsCollection Builder API" am: 216b67dace am: 786d91fba3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2010324

Change-Id: I0dcba0cbb7ff44cbb73cbd0f20106f81728f3109