Merge pull request #16899 from slavapestov/fix-non-required-base-class-convenience-init-witness

SILGen: Fix invalid SIL emitted when protocol requirement witnessed by base class convenience init