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

Change-Id: I2ca8cd6aec19e5f736d4a796ed882ce5d704ded9