Issue: androidx/media#10310 #minor-release PiperOrigin-RevId: 461889651 (cherry picked from commit 759de7d6)
