Merge changes from topic "am-1260d63cf1f54744bb60c2391ece9686"

* changes:
  [automerger skipped] Merge changes from topic "unencrypted-dirs-q" into qt-dev am: a318c254 am: c601e32e -s ours am: 8d8f4691 -s ours am: 58c7fa1a -s ours am: 5589682f -s ours am: d6bfc716 -s ours am: df092b72 -s ours am: e0b5fe54 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 2f2e7d84 am: 51fbb8e8 -s ours am: 393fde64 -s ours am: 3a4170de -s ours am: 873280e5 -s ours am: bfcb7f53 -s ours am: b87de79c -s ours am: 64c87dd2 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: 493aa93b am: 7271432d -s ours am: d1951bea -s ours am: 04ef13bd -s ours am: 1607beeb -s ours am: 798e6d78 -s ours am: e071fa65 -s ours am: 1139fd94 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: a296a2b7 am: 69764748 -s ours am: 4ec9daee -s ours am: 3d81f75d -s ours am: 702169eb -s ours am: 0fc89028 -s ours am: 20664186 -s ours am: c1f14389 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3d am: 245e4551 -s ours am: 00401eda -s ours am: 1fed4175 -s ours am: 00f6398e -s ours am: e523e5de -s ours am: 00a0d759 -s ours am: 95686255 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: f80dd3ec am: 9d4c8b60 -s ours am: 42b5cbc6 -s ours am: 9c2aaf60 -s ours am: bc8f7869 -s ours am: 1c53dec7 -s ours am: aa4f6435 -s ours am: b5a8c932 -s ours
  [automerger skipped] Check user unlocked before write to /data/system_ce/0/snapshots am: 3ab9dc11 am: 5f72388c -s ours am: c63b0311 -s ours am: 74c35b46 -s ours am: 34842572 -s ours am: 1314db8f -s ours am: f26b98e7 -s ours am: 658af7ab -s ours