Merging https://github.com/androidx/media/pull/110/commits/c37a767fdfc2f7e0b9eb1ad7ae6f864c93950712 PiperOrigin-RevId: 463826373 (cherry picked from commit 4d5d592c)
