Merge "Check user unlocked before write to /data/system_ce/0/snapshots" into rvc-dev am: 093730bff1

Change-Id: I80bb7c2a72b0e7bd26042b3b302dfcdbeff00764