Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696

OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java

@@ -339,6 +339,7 @@ public class OperationResultParcel implements Parcelable {
         MSG_MG_NEW_SUBKEY (R.string.msg_mg_new_subkey),
         MSG_MG_FOUND_NEW (R.string.msg_mg_found_new),
         MSG_MG_UNCHANGED (R.string.msg_mg_unchanged),
+        MSG_MG_NO_SECRET_KEYRING (R.string.msg_mg_no_secret_keyring),
 
         // secret key create
         MSG_CR (R.string.msg_cr),