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

[automerger skipped] Disable factory reset in DSU mode am: 27619dd4 -s ours am: c2513dc8 -s ours am: c3ae6b4e -s ours am: d84a064b -s ours am: f2b11f1a -s ours am: 2a186243 -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: I4fba9c5c125ddf689f854d360ec2629225dd6444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>