[automerger skipped] Merge "[MS49] Remove NetworkStats hidden Api usages" am:...

[automerger skipped] Merge "[MS49] Remove NetworkStats hidden Api usages" am: dac3f891 am: 21d08383 am: eb68eb5e am: 4ff6cf09 -s ours

am skip reason: Merged-In I8efecda5df403e9ed588daecd169cb3498d213a2 with SHA-1 25e26ea7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943133

Change-Id: Ia56cec30613970f926ddf6ed8a4dc7a095bfb9e1