change user_id primary key in database, use keyring rather than unified query in consolidate

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java

@@ -109,6 +109,15 @@ public class WrappedUserAttribute implements Serializable {
 
     }
 
+    public byte[][] getSubpackets() {
+        UserAttributeSubpacket[] subpackets = mVector.toSubpacketArray();
+        byte[][] ret = new byte[subpackets.length][];
+        for (int i = 0; i < subpackets.length; i++) {
+            ret[i] = subpackets[i].getData();
+        }
+        return ret;
+    }
+
     private void readObjectNoData() throws ObjectStreamException {
     }