[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 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: Ie80a76fd76c5663d7f5865c5b150d2a86e50ba16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>