This is a partial backport of [[https://github.com/bitcoin-core/secp256k1/pull/988 | secp256k1#988]]
https://github.com/bitcoin-core/secp256k1/pull/988/commits/8ae18f1ab3dce4c487bab75c2f0cdf4fe311b318
https://github.com/bitcoin-core/secp256k1/pull/988/commits/9ad09f6911906a1fa9af2c5540a8004e44f3ccc6
Depends on D19385