Merge "Freeze android.media.audio.common.types V3" into main