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

Change-Id: Id13276701627cd03a5fbbd8f553e34bf7d8938f6