gpg: Make sure the conflict set includes the current key.

gpg: Make sure the conflict set includes the current key.

* g10/tofu.c (get_trust): Sanity check CONFLICT_SET after calling
get_policy.  If POLICY is 'auto' and the default policy is 'ask', make
sure CONFLICT_SET includes the current key.

--
Signed-off-by: Neal H. Walfield <neal@g10code.com>
GnuPG-bug-id: 2959
Debian-bug-id: 854829

Signed-off-by: Neal H. Walfield <neal@g10code.com>
(cherry picked from commit b1106b4d640325c60a7212a4a44e4f67c0e3312d)

Gbp-Pq: Name 0052-gpg-Make-sure-the-conflict-set-includes-the-current-.patch