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