[automerger skipped] Update tests for NetworkStats code move. am: 3d52172838 am: c7d509be56 am: e40c61af83 -s ours

am skip reason: Merged-In Ie48dac421decf83440b7c88adea18152e05f03bb with SHA-1 4a18ab2e43 is already in history

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

Change-Id: Ia5800c95cbb7a4b79a62d2ec33fe75379a0998d3