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

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



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