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 am: 850ae22f
Change-Id: I3ed9e46c78e8d69961a3cc73bf9f74e673e94377