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

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

Change-Id: I942197839e762204e69beec2c09af38b8b4519b4