[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d -s ours...

[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d -s ours am: 228792b4 -s ours

am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a0789 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29110303



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