Merge "[MS83] Add Cts for NetworkStatsCollection/History builders" am: 6a957c70c0

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

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