Also sync up with master on refactorings in ContentDisposition and ContentDispositionTests. Closes gh-24224