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

Change-Id: Ie9c8a53148ab9e31032886ad30b0a085a46d4f35