Merge "No-op refactoring for TrafficStats APIs" into main am: 05fb57ea97 am: 0bc4d4ea5e

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

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