tree 81024ca91c1988765356f0b95609ecab7f0af1eb
parent 27a963097f8b507277e3c67b144aa799eceac542
parent b679307a1c94b90f9dcce6c44d7b71555731b34a
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: b679307a1c

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

Change-Id: Icce4e92c3878ebbcb7db1f4f74f6427cda7c57c4