Merge changes from topic "unencrypted-dirs-s" into sc-dev am: bc7a25dff4 am: 856b62f907 am: df7e8c7203

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452466

Change-Id: Id73438fbad391a3013287dc2671af71325307771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

services/core/java/com/android/server/StorageManagerService.java

@@ -126,6 +126,7 @@ import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.AtomicFile;
 import android.util.DataUnit;
+import android.util.EventLog;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Slog;
@@ -3340,6 +3341,7 @@ class StorageManagerService extends IStorageManager.Stub
                 }
             }
         } catch (Exception e) {
+            EventLog.writeEvent(0x534e4554, "224585613", -1, "");
             Slog.wtf(TAG, e);
             // Make sure to re-throw this exception; we must not ignore failure
             // to prepare the user storage as it could indicate that encryption