psbt: Include and allow both non_witness_utxo and witness_utxo for segwit inputs

Summary:
Backport of core PR19215.

The relevant commits are:

• https://github.com/bitcoin/bitcoin/pull/19215/commits/5279d8bc07d601fe6a67ad665fbc7591fe73c7de
• https://github.com/bitcoin/bitcoin/pull/19215/commits/84d295e51341a126a6c3cbeea7a8caa04c7b5bc3

Test Plan:

ninja all check-all

Reviewers: #bitcoin_abc, majcosta

Reviewed By: #bitcoin_abc, majcosta

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