Issue: androidx/media#500 #minor-release PiperOrigin-RevId: 545942450 (cherry picked from commit 85d2e9bbb3d4ea7d65f7151f27abe5731b27f5d4)
