Merge "Add unit test for fromPublicNetworkStats" into main am: 8542185715 am: 066963741d

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

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