Merge "Revert "Add hidden API getDataSaverViaCmFlag() for CTS"" into main