Merge "Renamed ContentCaptureService.disableContentCaptureServices to disableSelf()"