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

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

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