Merge "Add checking permission at the setDataSaverModeEnabled()" am: 639fe64ce0
am: a83bbf3516

Change-Id: I6f712ec5774287af1740f2e74a4bc5cbca0cba6c