Merge "Hide the FILE_MANAGEMENT foreground service type"