Merge changes from topic "am-28d457cd546149c3b2acf232ddb9ed91" into tm-dev

* changes:
  [automerger skipped] Merge changes from topic "unencrypted-dirs-r" into rvc-dev am: 74c295ea am: 5526853e -s ours am: ff2c282f -s ours am: a7f9adbc -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Log to EventLog on prepareUserStorage failure am: 07629616 am: 4df21cf7 -s ours am: 54a7bd48 -s ours am: fc900232 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] Ignore errors preparing user storage for existing users am: e03e9873 am: be952611 -s ours am: 0f285346 -s ours am: 74699e90 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery for system user only am: ecf569bd am: 4eadb461 -s ours am: ef37c0da -s ours am: 468c5c5a -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: 69c3ce70 am: d685b63f -s ours am: 39bf332a -s ours am: 79f22718 -s ours
  [automerger skipped] [RESTRICT AUTOMERGE] StorageManagerService: don't ignore failures to prepare user storage am: ecffe3ec am: ee88d1fd -s ours am: a86355bf -s ours am: ceb59ff9 -s ours