Merge "Snap for 8691180 from 9bfcb851c99aca018ef8a97b410ee8610a376ea5 to androidx-compose-release" into androidx-compose-release