Also add handling of `C.TRACK_TYPE_IMAGE` in a couple of places where it was missing. #exofixit PiperOrigin-RevId: 395078312
