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: 0a2f4c48 am: 7ddeedc5 am: 139bcc4c
Change-Id: I24f338eade16661853e8a63a36cc41217a77c046