[automerger skipped] Merge "Delete expired CE APEX snapshots when user...

[automerger skipped] Merge "Delete expired CE APEX snapshots when user unlocks." into rvc-dev am: a6eb7fa2 am: 145b90ca am: 3dca9136 am: 442c4617 -s ours

am skip reason: Change-Id Icf31d1dd67449edc22d530798a0d67d329e30b62 with SHA-1 a05ba8ee is in history

Change-Id: I48a9065efd28a9a53a68f7f9f44d4007c229ad84