Merge "Data Saver Mode should automatically allow foreground services." into nyc-dev