tree a88e35b36fd5ded11aa3bdfa2f52a7a743be1c7c
parent 16856ba3fd2e32db91833333519b7b6b5e3896ce
parent f8abec4fa5893ba957a7f4afb1594886946cb19d
author Aaron Huang <huangaaron@google.com> 1643273943 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1643273943 +0000

Merge "Move NETWORK_TYPE_5G_NSA from NetworkTemplate to NetworkStatsManager" am: 75ed57cd6a am: f8abec4fa5

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

Change-Id: Icce4e92c3878ebbcb7db1f4f74f6427cda7c57c4