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

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

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