[automerger skipped] Disable factory reset in DSU mode am: a2741a76cb
-s ours am: d8cb5e9765
-s ours am: 98160a777b
-s ours am: abaca3ca7f
-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: If55a2821cbecd2453b4f7c854de072eaf146739b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: