Merge "Fixed ContentCaptureManager.getServiceComponentName()"