Merge "Remove dependencies on hidden network stats APIs" am: e299e37585 am: 35dea12973 am: 8576384cfb

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

Change-Id: If5ca64b8748d28e118c100928bc23502ff86bbaa