[automerger skipped] Disable factory reset in DSU mode am: 0764d71e82
-s ours am: a9662d8983
-s ours am: 6dac577285
-s ours
am skip reason: Merged-In I485eb6ac7beec0893d91ca5fe8ad88ecd96a5cbe with SHA-1 15af7d7d55
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/29068594
Change-Id: Ice4ef46cb73c0f9a113bcadfb7d72e90aff85a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: