Accidental changes were introduced in http://https://github.com/androidx/media/commit/c07c4cc95dc4ff625e4f95d8f5c06d31141c6fd8 PiperOrigin-RevId: 406858888