Merge "Revert "Add hidden API getDataSaverViaCmFlag() for CTS"" into main am: 0a4ba7bfca am: a2e1f6988e am: 2cf1ca3a0e

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

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