[automerger skipped] Merge "[MS48.2] Remove NetworkStatsHistory from...

[automerger skipped] Merge "[MS48.2] Remove NetworkStatsHistory from CycleAdaptor" am: cd2bbccf am: 5799ee88 am: 752e7a3b am: 3ae8de50 -s ours

am skip reason: Merged-In Ia778d680d5354fb67476db0763dfab017284dc4a with SHA-1 3a15d6ca is already in history

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

Change-Id: I6a0655d3db9a6ad0cb5ea38b3d363da56a648cac