Merge upstream openzeppelin-contracts into upstream-patched

docs/modules/ROOT/pages/erc721.adoc

@@ -17,9 +17,10 @@ Here's what a contract for tokenized items might look like:
 pragma solidity ^0.8.0;
 
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
+import "@openzeppelin/contracts/token/ERC721/extensions/ERC721URIStorage.sol";
 import "@openzeppelin/contracts/utils/Counters.sol";
 
-contract GameItem is ERC721 {
+contract GameItem is ERC721URIStorage {
     using Counters for Counters.Counter;
     Counters.Counter private _tokenIds;