Descriptor expansions only need pubkey entries for PKH/WPKH

Summary:
This is a backport of Core PR15263

Depends on D6198

Test Plan:

ninja all check-all

Reviewers: #bitcoin_abc, Fabien

Reviewed By: #bitcoin_abc, Fabien

Differential Revision: https://reviews.bitcoinabc.org/D6200