[automerger skipped] Disable factory reset in DSU mode am: a2741a76cb
-s ours am: d8cb5e9765
-s ours am: 13412879cc
-s ours am: 8f55d65e04
-s ours am: d9c410ea15
-s ours am: 353742dbc2
-s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 27619dd45c
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066436
Change-Id: I1a9a9d954e1113ce61e41a5621c8064576feb09c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: