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