Merge "Revert "[Settings] Code refactor DataSaverSummary"" am: b0a2857ec5

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

Change-Id: Ibdca526adba3a2fb79cec39101832d53d87b46b7