Issue: androidx/media#102 #minor-release PiperOrigin-RevId: 461891031 (cherry picked from commit 5bf9e2fb)