[automerger] Fix failing FileTest#test_canonicalCachesAreOff() am: 07e6e4e2af

Change-Id: I8fc4b6892e3d0c68aeb5cc14a7573c00813a22f7