This reverts commit 0bac2aae596771db020f01a57fee4828081fbc38. Reason for revert: Suspected breakages downstream Original change's description: > Use Payload Type suggester for all codec merging > > Bug: webrtc:360058654 > Change-Id: Id475762253c427c1800c2352a60fc0121c2dc388 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364783 > Reviewed-by: Florent Castelli <orphis@webrtc.org> > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43267} Bug: webrtc:360058654, b/375132036 Change-Id: Ieda626270193e7e6c93903b3c03a691b2bf0c1e2 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/366540 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Florent Castelli <orphis@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43290}