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

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

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