Merge "Skip NetworkStatsServiceTest before T" am: fc67ee8c71 am: 44a4bb6d45

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

Change-Id: I214801d49cded51f39111b5d7a61a3a35b772611