[automerger skipped] Disable factory reset in DSU mode am: 4296cc19 am:...

[automerger skipped] Disable factory reset in DSU mode am: 4296cc19 am: d1f90f71 am: fc128d43 -s ours am: 7d3a9a19 -s ours am: fbebc1cd -s ours am: 9c42b187 -s ours am: 374da97b -s ours am: 156454b4 -s ours

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

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



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