[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev...

[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-v2-dev am: 87a47bad -s ours am: 772238ab -s ours am: 941e1cad -s ours am: b12551aa -s ours am: b75fa805 -s ours am: ec30e06a -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: Iff51d66f98fedd8dacbdf78bce74ca5ce94f8612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>