[automerger skipped] Disable factory reset in DSU mode am: 4296cc1977
am: d1f90f717a
am: fc128d434f
-s ours am: 7d3a9a197f
-s ours am: fbebc1cd0e
-s ours am: 9c42b1876f
-s ours am: 374da97b52
-s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 d45a07894b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/30066430
Change-Id: I698f8ac57efbd90e5499ea48d1b649c2631a3b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: