Merge "Rename Service Side TrafficStats Cache" into main am: ba780ae2a3 am: 0d3115acea

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

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