Merge "Delete expired CE snapshots of app data when user unlocks." into rvc-dev am: 70e8f5d506

Change-Id: Ica1d64db02dd5204dea69b95425c7db2a6217336