Merge "Changed ContentCaptureManagerService to have a static TAG var for logging"