Merge "New method ContentCaptureManager.getServiceSettingsComponentName()"