Merge changes from topic "trafficstats-client-cache" into main am: 8a2862bd92

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

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