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: 34d41508

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



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