Merge "Merge "Delete expired CE snapshots of app data when user unlocks." into rvc-dev am: 70e8f5d5 am: 4479c751" into rvc-d1-dev-plus-aosp