Merge "Delete expired CE snapshots of app data when user unlocks." into rvc-dev am: 70e8f5d5 am: b6a197ba Change-Id: I493a1b474d5408d60ee47e4519a438e5b3123fa7