Merge "[Settings] enhancing data saver config control" into tm-qpr-dev am: 106fd865

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



Change-Id: I5338c24812346b79068b1fee0c5ba98ff07eec33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>