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: 2bafcaa5
Change-Id: I660c2c619cdb650a0e8f142d0c9ff3516fb3bdcf