resolving comments from https://github.com/androidx/media/commit/71e92f75126902fd85ab35fbe36bd51061e06993. PiperOrigin-RevId: 510457401
