Issue: androidx/media#86 #minor-release PiperOrigin-RevId: 455182232 (cherry picked from commit 8f844b32)