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