Merge "Initial implementation of ContentCaptureService.setContentCaptureWhitelist()"