Merge "Fix test flake in AutoTileManagerTest"