Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71

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

Change-Id: I5de3ecb76ce3b4c745c39c4486ba75f2ca9c046e