Merge changes from topic "unencrypted-dirs-s" into sc-dev

* changes:
  Log to EventLog on prepareUserStorage failure
  Ignore errors preparing user storage for existing users
  UserDataPreparer: reboot to recovery for system user only
  UserDataPreparer: reboot to recovery if preparing user storage fails
  StorageManagerService: don't ignore failures to prepare user storage