[automerger skipped] Merge "Check user unlocked before write to /data/system_ce/0/snapshots" am: 8737830ed4 am: 00ac337a69 -s ours am: c54f85531d -s ours am: 900efd6fce -s ours
am skip reason: Change-Id Ie9d4a28008adc93e27bc8ab015a3a6507428c3e4 with SHA-1 2f9987f507 is in history
Change-Id: Ia61eb1f908d8c6acf4825f4a88cce993c931956f
This commit is contained in: