[automerger] Fix ICryptoFactory service am: 8a85370679  -s ours am: 8005b769f4

Change-Id: Ia2cbc29a885201279c26a0fcf8a0f58b5a1d51dd