Merge "Revert "Revert "[BR07.2] Redirect data saver switch to Connectiv...""...

Merge "Revert "Revert "[BR07.2] Redirect data saver switch to Connectiv..."" into main am: c056440a am: dd75255d am: 48093eb9

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



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