Imported from GitHub PR https://github.com/google/ExoPlayer/pull/5140 https://github.com/google/ExoPlayer/pull/5086 moved onto the right branch. Merge 8822e188d24c1d9b3ed101918763b16e46c8debc into 0c385a85 PiperOrigin-RevId: 222633340
