Merge "Snap for 13832294 from a79f65559eb51e0bc7a66668c37bb78c489eae0b to androidx-compose-release" into androidx-compose-release