Merge "Move fromPublicNetworkStats to statsd" into main am: 56e83f5dfd am: c85443e472

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

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