Merge "Keep ContentCapturePerUserService alive while the package is being updated."