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

Change-Id: Iad6221be6c7bdb9d8b66f287f3e261c138ce499a