Merge "Fix minor typo in ContentCaptureManager Javadoc"