Merge "Made ContentCapture APIs available for testing."