Follow-up to address comments from https://github.com/androidx/media/commit/d8b9d378d9145c1e074e4dfd3a791fde912e154c. PiperOrigin-RevId: 408600470
