Increase shard inactive time to 1h in upgrade tests (#52051)

Similar to the fix in #51651, this commit increases the shard inactive 
timeout for x-pack.

Closes #52031

x-pack/qa/full-cluster-restart/build.gradle

@@ -70,7 +70,7 @@ for (Version bwcVersion : bwcVersions.indexCompatible) {
 
       setting 'path.repo', "${buildDir}/cluster/shared/repo/${baseName}"
       // some tests rely on the translog not being flushed
-      setting 'indices.memory.shard_inactive_time', '20m'
+      setting 'indices.memory.shard_inactive_time', '60m'
       setting 'xpack.security.enabled', 'true'
       setting 'xpack.security.transport.ssl.enabled', 'true'
       setting 'xpack.license.self_generated.type', 'trial'

x-pack/qa/full-cluster-restart/src/test/java/org/elasticsearch/xpack/restart/CoreFullClusterRestartIT.java

@@ -22,9 +22,4 @@ public class CoreFullClusterRestartIT extends FullClusterRestartIT {
                 .build();
     }
 
-    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/52031")
-    @Override
-    public void testRecovery() throws Exception {
-        super.testRecovery();
-    }
 }