Merge "Revert "[BR07.2] Redirect data saver switch to ConnectivityManager"" into main am: 8de597025e

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

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