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

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

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