Merge "Move fromPublicNetworkStats to statsd" into main am: 930130ca03 am: cfc84cce9c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3226929

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