This should have been done in https://github.com/androidx/media/commit/21e659ef8e62d57be5ed77c80c1c80df94a8f952 PiperOrigin-RevId: 411073049
