[cp][aptos-release-v1.20] Fix potential deadlock in state_key::Entry:…

…:drop (#14710)

Co-authored-by: Alden Hu <msmouse@gmail.com>

types/src/state_store/state_key/registry.rs

@@ -152,13 +152,13 @@ where
         let mut locked = self.inner.write();
         if let Some(map2) = locked.get_mut(key1) {
             if let Some(entry) = map2.get(key2) {
-                if entry.upgrade().is_none() {
+                if entry.strong_count() == 0 {
                     map2.remove(key2);
+                    if map2.is_empty() {
+                        locked.remove(key1);
+                    }
                 }
             }
-            if map2.is_empty() {
-                locked.remove(key1);
-            }
         }
     }