Merge "Modify StatsPullAtomService: Log network type in WW tagged traffic data." into main am: 731829eccf am: a42569ab26 am: 7f3ad22a5f

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

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