[automerger skipped] Merge "[Settings] enhancing data saver config control"...

[automerger skipped] Merge "[Settings] enhancing data saver config control" into tm-qpr-dev am: 106fd865 am: 56e5d50c -s ours

am skip reason: Merged-In I909522c0244ebb012a27d6aff34120a4f90128c6 with SHA-1 af614b82 is already in history

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



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