Follow-up to https://github.com/androidx/media/commit/a5330d43d4c3b5c464d9d35d39c0185216587c90 PiperOrigin-RevId: 437777871
