Merge "Changed ContentCaptureService.setContentCaptureWhitelist() to use Set instead of List."