Merge "Delete expired CE APEX snapshots when user unlocks." into rvc-dev am: a6eb7fa2 am: 866e6ab9 Change-Id: I3109bd6a936794aa97165d1031c68e122cfe1a27