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

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

Change-Id: If886978cb250912e38b978233210ad0ee2d6a88b