[automerger skipped] Merge "Remove dependencies on hidden network stats APIs" am: e299e37585
am: 35dea12973
am: 8576384cfb
am: 1dd7274517
-s ours
am skip reason: Merged-In I4151b831fc83dee9b36292cd7991f9b294ed4ff2 with SHA-1 0dd1b46fcf
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1976626
Change-Id: I28acb1aa21ea36fac656331e34d8287cca057b6e
This commit is contained in: