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

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

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