Merge "Update the foreground service type to dataSync"