Merge "Check user unlocked before write to /data/system_ce/0/snapshots" into...
Merge "Check user unlocked before write to /data/system_ce/0/snapshots" into rvc-dev am: 093730bf am: 43ea4cb8 am: 693fc535
Change-Id: I23d4970e548e32a4eda608922efe31907640d35d