Merge "Modify StatsPullAtomService: Log network type in WW tagged traffic data." into main am: 731829ec am: a97d6ff5

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



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