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

[automerger skipped] Disable factory reset in DSU mode am: 0764d71e -s ours am: a9662d89 -s ours

am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d is already in history

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



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