Merge "Snap for 11419326 from 91be5ea32bf72bc97d5eda04423980d06e1b9d30 to androidx-g3-release" into androidx-g3-release