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

[automerger skipped] Disable factory reset in DSU mode am: a2741a76 -s ours am: d8cb5e97 -s ours am: 13412879 -s ours am: 8f55d65e -s ours am: d9c410ea -s ours

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

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



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