Merge changes from topic "am-7a5f52f47235411fa8dfee28cc6f9acb" into tm-d1-dev-plus-aosp

* 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: 382e2b6a -s ours am: 9e7d057d -s ours am: a9fad69c -s ours am: 03e06403 -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: 32cee826 -s ours am: 716c9b3d -s ours am: 9b8453bc -s ours am: 3115eb63 -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: c2726df7 -s ours am: 45d6a8a9 -s ours am: 1f7af138 -s ours am: 1de734bc -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: b29063c0 -s ours am: fc37c36c -s ours am: dd977d09 -s ours am: c1371bce -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: 9ebbc455 -s ours am: 97df5e8b -s ours am: f601af78 -s ours am: 6dc31bfa -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: 68f347d2 -s ours am: 144ab7db -s ours am: 9346eb84 -s ours am: 2c283fbd -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: aa7e540e -s ours am: 5afbc7f2 -s ours am: 2c90b00e -s ours am: 0d471528 -s ours