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

[automerger skipped] Disable factory reset in DSU mode am: 27619dd4 -s ours am: c2513dc8 -s ours

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

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



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