Merge "[DU05]Remove the android.provider.Settings.Global in NetworkStatsService" am: b1a917a791 am: 5840685367 am: d461aa2623

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

Change-Id: I8280bd82dca140e37308f167e5a89f5b82b9b16c