Merge "Snap for 9654699 from 8f6cec6ca74bbbaf4a728f9965f124ff5b87f08f to androidx-compose-release" into androidx-compose-release