[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: bd29320e -s ours am: cf2d79ba -s ours am: 3e029098 -s ours am: 87b37d0b -s ours am: ceb4c429 -s ours am: 27a3d7bc -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: I53a0f0217341a6464bf592d13c75c914d71d53a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>