[automerger skipped] Disable factory reset in DSU mode am: 15af7d7d55
-s ours am: 7c1a58f697
-s ours am: 3785300025
-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/+/29110303
Change-Id: If74da16bf2b37899d370e67a302a8df98d3f08fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: