Merge "Refactored NetworkManagerService to support Data Saver." into nyc-dev