Merge "Disable tethering when Data Saver mode is on." into nyc-dev