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

Change-Id: I8f0d9826a7eb9d5abd83836689caac6ccd17322e