[automerger skipped] [MS54.1] Move NetworkStats to updatable sources am:...

[automerger skipped] [MS54.1] Move NetworkStats to updatable sources am: 6b708138 am: 2f00b073 am: 4f928cc3 -s ours am: a6c0923f -s ours

am skip reason: Merged-In I244693aebe1782d9e67502638ff8145c51462e1e with SHA-1 a8f1f762 is already in history

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

Change-Id: I670910e2b1c6cb7411c1d9bf75416b321c28ed18