Merge "Fix style errors in NetworkStats" am: b84de74137 am: f49be5f320 am: 9d3dd632e2

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

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