[automerger skipped] Merge "Disable factory reset in DSU mode" into...

[automerger skipped] Merge "Disable factory reset in DSU mode" into sc-qpr1-dev am: 93b2db63 -s ours am: 8009906c -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: I13e0585463f359d309e5b08791d84376c941fd1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>