Merge "vold: Do not cache CE keys in vold" am: 432ca5af06 am: 8427b24fc5

Change-Id: I52ee506f94ccab65fd3cc26a5fb0366e49e3d178