Merge "Fixed Settings.ACTION_REQUEST_ENABLE_CONTENT_CAPTURE javadoc"