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

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

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