Merge "New API: ContentCaptureService.onActivityEvent()"