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