Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71 am: a969e7eadd

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

Change-Id: I1611eba7a1a566f27c2cbce1633e325873973eb7