Merge "Revert "Update AudioFormat setChannelMask comment"" into main