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

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



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