Allow the use of keyrings exported with --export-secret-subkeys

Applied patch taken from:
https://github.com/mikecardwell/android-privacy-guard
Commit: 688ebb8829