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

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



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